From 487de33a33657826218c3f983ab70c47f11f8773 Mon Sep 17 00:00:00 2001
From: ajacoutot <ajacoutot@openbsd.org>
Date: Sun, 22 Nov 2009 16:40:03 +0000
Subject: [PATCH] Regen WANTLIB after CUPS gnutls -> openssl move.
---
net/samba/Makefile | 7 +++----
print/gtklp/Makefile | 16 ++++++++--------
print/splix/Makefile | 11 ++++-------
print/splix/pkg/PLIST | 6 +-----
print/xpp/Makefile | 10 ++++------
print/xpp/pkg/PLIST | 4 ++--
x11/gnome/libgnomecups/Makefile | 7 +++----
x11/gnome/libgnomeprint/Makefile | 8 ++++----
x11/gnustep/gui/Makefile | 11 +++++------
x11/gtk+2/Makefile | 11 ++++++-----
x11/xfce4/xfprint/Makefile | 19 ++++++++++---------
11 files changed, 50 insertions(+), 60 deletions(-)
diff --git a/net/samba/Makefile b/net/samba/Makefile
index bd09cb977c2..df16ef311e0 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.107 2009/10/11 19:45:46 sthen Exp $
+# $OpenBSD: Makefile,v 1.108 2009/11/22 16:40:03 ajacoutot Exp $
COMMENT-main= SMB and CIFS client and server for UNIX
COMMENT-docs= additional documentation and examples for Samba
DISTNAME= samba-3.0.37
-PKGNAME-main= ${DISTNAME}
+PKGNAME-main= ${DISTNAME}p0
FULLPKGNAME-docs= ${DISTNAME:S/-/-docs-/}
SHARED_LIBS= smbclient 1.0 \
msrpc 1.0
@@ -65,8 +65,7 @@ MULTI_PACKAGES= -main -docs
.if ${FLAVOR:L:Mcups}
LIB_DEPENDS+= cups::print/cups
-WANTLIB += asn1 crypto gcrypt gnutls gpg-error gssapi intl krb5
-WANTLIB += m pthread z
+WANTLIB += asn1 crypto gssapi krb5 m pthread ssl z
.else
CONFIGURE_ARGS+= --disable-cups
.endif
diff --git a/print/gtklp/Makefile b/print/gtklp/Makefile
index 88525e0b215..4a136618938 100644
--- a/print/gtklp/Makefile
+++ b/print/gtklp/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.6 2009/08/10 06:34:08 kili Exp $
+# $OpenBSD: Makefile,v 1.7 2009/11/22 16:40:03 ajacoutot Exp $
COMMENT= GTK+2 frontend to CUPS
DISTNAME= gtklp-1.2.7
-PKGNAME= ${DISTNAME}p0
+PKGNAME= ${DISTNAME}p1
CATEGORIES= print sysutils x11
EXTRACT_SUFX= .src.tar.gz
@@ -18,14 +18,14 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gtklp/}
-
WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
WANTLIB += Xi Xinerama Xrandr Xrender asn1 atk-1.0 c cairo crypto
-WANTLIB += expat fontconfig freetype gcrypt gio-2.0 glib-2.0 glitz
-WANTLIB += gmodule-2.0 gnutls gobject-2.0 gpg-error gssapi krb5
-WANTLIB += m pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1 png
-WANTLIB += pthread pthread-stubs xcb z
+WANTLIB += expat fontconfig freetype gio-2.0 glib-2.0 glitz gmodule-2.0
+WANTLIB += gobject-2.0 gssapi krb5 m pango-1.0 pangocairo-1.0
+WANTLIB += pangoft2-1.0 pixman-1 png pthread pthread-stubs ssl
+WANTLIB += xcb z
+
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gtklp/}
MODULES= devel/gettext
diff --git a/print/splix/Makefile b/print/splix/Makefile
index 027244ae625..ccae1da9a22 100644
--- a/print/splix/Makefile
+++ b/print/splix/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.4 2009/10/27 14:36:44 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.5 2009/11/22 16:40:03 ajacoutot Exp $
COMMENT= CUPS drivers for SPL printers
DISTNAME= splix-2.0.0
-PKGNAME= ${DISTNAME}p2
+PKGNAME= ${DISTNAME}p3
CATEGORIES= print
EXTRACT_SUFX= .tar.bz2
@@ -16,13 +16,10 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
+WANTLIB += asn1 c crypto gssapi krb5 m pthread ssl stdc++ z
+
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=splix/}
-WANTLIB += asn1 c crypto gcrypt gnutls gpg-error gssapi krb5 m
-WANTLIB += pthread stdc++ z
-
-MODULES= devel/gettext
-
LIB_DEPENDS= cups.>=3,cupsimage::print/cups \
jbig.>=2::graphics/jbigkit
# pstoraster
diff --git a/print/splix/pkg/PLIST b/print/splix/pkg/PLIST
index c13b4b63d0a..de81724e645 100644
--- a/print/splix/pkg/PLIST
+++ b/print/splix/pkg/PLIST
@@ -1,10 +1,6 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2009/03/17 18:37:20 ajacoutot Exp $
-libexec/cups/
-libexec/cups/filter/
+@comment $OpenBSD: PLIST,v 1.2 2009/11/22 16:40:03 ajacoutot Exp $
@bin libexec/cups/filter/pstoqpdl
@bin libexec/cups/filter/rastertoqpdl
-share/cups/
-share/cups/model/
share/cups/model/dell/
share/cups/model/dell/1100.ppd
share/cups/model/dell/1100fr.ppd
diff --git a/print/xpp/Makefile b/print/xpp/Makefile
index a4f88b63080..c9c7c9a9dd6 100644
--- a/print/xpp/Makefile
+++ b/print/xpp/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.9 2009/09/18 16:25:35 jasper Exp $
+# $OpenBSD: Makefile,v 1.10 2009/11/22 16:40:03 ajacoutot Exp $
COMMENT= X Printing Panel
DISTNAME= xpp-1.5
-PKGNAME= ${DISTNAME}p4
+PKGNAME= ${DISTNAME}p5
CATEGORIES= print sysutils
HOMEPAGE= http://cups.sourceforge.net/xpp/
@@ -14,10 +14,8 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
-WANTLIB += GL ICE SM X11 Xau Xdmcp Xext asn1 c crypto gcrypt gnutls
-WANTLIB += gpg-error gssapi krb5 m pthread pthread-stubs stdc++ xcb z
-
-MODULES= devel/gettext
+WANTLIB += GL ICE SM X11 Xau Xdmcp Xext asn1 c crypto gssapi krb5
+WANTLIB += m pthread ssl stdc++ z
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=cups/}
diff --git a/print/xpp/pkg/PLIST b/print/xpp/pkg/PLIST
index 3a58a578276..dd893da98ce 100644
--- a/print/xpp/pkg/PLIST
+++ b/print/xpp/pkg/PLIST
@@ -1,2 +1,2 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2006/10/22 12:02:11 mbalmer Exp $
-bin/xpp
+@comment $OpenBSD: PLIST,v 1.2 2009/11/22 16:40:04 ajacoutot Exp $
+@bin bin/xpp
diff --git a/x11/gnome/libgnomecups/Makefile b/x11/gnome/libgnomecups/Makefile
index 3e352868a6a..458619fb38c 100644
--- a/x11/gnome/libgnomecups/Makefile
+++ b/x11/gnome/libgnomecups/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.11 2009/07/12 20:32:02 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.12 2009/11/22 16:40:04 ajacoutot Exp $
COMMENT= GNOME library for CUPS interaction
GNOME_PROJECT= libgnomecups
GNOME_VERSION= 0.2.3
-PKGNAME= ${DISTNAME}p5
+PKGNAME= ${DISTNAME}p6
SHARED_LIBS= gnomecups-1.0 1.0 # .1.0
CATEGORIES= devel
@@ -17,8 +17,7 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
-WANTLIB += asn1 crypto gcrypt gnutls gpg-error gssapi krb5 m pcre
-WANTLIB += tasn1 z
+WANTLIB += asn1 crypto gssapi krb5 m pcre ssl z
MODULES= devel/gettext \
x11/gnome
diff --git a/x11/gnome/libgnomeprint/Makefile b/x11/gnome/libgnomeprint/Makefile
index 2438b0c5f7f..5f0bfb5b14b 100644
--- a/x11/gnome/libgnomeprint/Makefile
+++ b/x11/gnome/libgnomeprint/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.32 2009/08/11 08:39:38 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.33 2009/11/22 16:40:04 ajacoutot Exp $
COMMENT= printing framework for GNOME
GNOME_PROJECT= libgnomeprint
GNOME_VERSION= 2.18.6
-PKGNAME= ${DISTNAME}p3
+PKGNAME= ${DISTNAME}p4
SHARED_LIBS += gnomeprint-2-2 2.1 # .1.0
@@ -19,8 +19,8 @@ PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB += X11 Xau Xdmcp asn1 crypto cups expat fontconfig freetype
-WANTLIB += gcrypt glib-2.0 gmodule-2.0 gnutls gobject-2.0 gpg-error
-WANTLIB += gssapi gthread-2.0 krb5 m pcre tasn1 z pthread-stubs xcb
+WANTLIB += glib-2.0 gmodule-2.0 gobject-2.0 gssapi gthread-2.0
+WANTLIB += krb5 m pcre pthread-stubs ssl xcb z
MODULES= devel/gettext \
x11/gnome
diff --git a/x11/gnustep/gui/Makefile b/x11/gnustep/gui/Makefile
index 76e61a56dda..7e6fb43b74c 100644
--- a/x11/gnustep/gui/Makefile
+++ b/x11/gnustep/gui/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.13 2009/05/23 17:09:31 benoit Exp $
+# $OpenBSD: Makefile,v 1.14 2009/11/22 16:40:04 ajacoutot Exp $
COMMENT= GNUstep gui library
DISTNAME= gnustep-gui-0.16.0
-PKGNAME= ${DISTNAME}p2
+PKGNAME= ${DISTNAME}p3
CATEGORIES= devel
# needs to follow gnustep-back backend versioning
@@ -12,13 +12,12 @@ SHARED_LIBS= gnustep-gui 0.16 # .0.16.0
HOMEPAGE= http://www.gnustep.org/
-WANTLIB += asn1 c crypto gcrypt gnutls gpg-error gssapi krb5 m
-WANTLIB += objc pthread stdc++ tiff z
+WANTLIB += asn1 c crypto gssapi krb5 m objc pthread ssl stdc++
+WANTLIB += tiff z
MASTER_SITES= ${MASTER_SITE_GNUSTEP:=core/}
-MODULES= x11/gnustep \
- devel/gettext
+MODULES= x11/gnustep
LIB_DEPENDS= aspell.>=16::textproc/aspell/core \
audiofile::devel/libaudiofile \
diff --git a/x11/gtk+2/Makefile b/x11/gtk+2/Makefile
index 544ba4cf3fd..12c78cea1d2 100644
--- a/x11/gtk+2/Makefile
+++ b/x11/gtk+2/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.90 2009/10/17 16:14:54 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.91 2009/11/22 16:40:04 ajacoutot Exp $
SHARED_ONLY= Yes
@@ -11,7 +11,7 @@ DISTNAME= gtk+-${VERSION}
PKGNAME-main= gtk+2-${VERSION}
PKGNAME-docs= gtk+2-docs-${VERSION}
-PKGNAME-cups= gtk+2-cups-${VERSION}
+PKGNAME-cups= gtk+2-cups-${VERSION}p0
CATEGORIES= x11 devel
@@ -61,9 +61,10 @@ PKG_ARCH-docs= *
LIB_DEPENDS-cups= ${LIB_DEPENDS} \
cups.>=3::print/cups \
gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::${BASE_PKGPATH},-main
-WANTLIB-cups= ${WANTLIB} atk-1.0 gio-2.0 glib-2.0 gmodule-2.0 \
- gobject-2.0 pango-1.0 pangocairo-1.0 asn1 crypto gssapi krb5 \
- pangoft2-1.0 png gcrypt gnutls gpg-error tasn1
+WANTLIB-cups += ${WANTLIB}
+WANTLIB-cups += asn1 atk-1.0 crypto gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0
+WANTLIB-cups += gssapi krb5 pango-1.0 pangocairo-1.0 pangoft2-1.0 png
+WANTLIB-cups += ssl
USE_X11= Yes
USE_GMAKE= Yes
diff --git a/x11/xfce4/xfprint/Makefile b/x11/xfce4/xfprint/Makefile
index 64e8e21c4cb..ecf5ddb526c 100644
--- a/x11/xfce4/xfprint/Makefile
+++ b/x11/xfce4/xfprint/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.13 2009/08/11 19:54:01 landry Exp $
+# $OpenBSD: Makefile,v 1.14 2009/11/22 16:40:04 ajacoutot Exp $
COMMENT= Xfce4 printing helper
XFCE_PROJECT= xfprint
-PKGNAME= ${DISTNAME}p1
+PKGNAME= ${DISTNAME}p2
MASTER_SITES= http://archive.xfce.org/src/archive/${XFCE_PROJECT}/${XFCE_BRANCH}/
SHARED_LIBS= xfprint 0.1
@@ -27,12 +27,13 @@ LIB_DEPENDS= xfcegui4.>=4::x11/xfce4/libxfcegui4 \
xfconf-0::x11/xfce4/xfconf \
cups.>=3::print/cups
-WANTLIB= ICE SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext \
- Xfixes Xi Xinerama Xrandr Xrender atk-1.0 c cairo dbus-1 \
- dbus-glib-1 expat fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0 \
- gio-2.0 glib-2.0 glitz gmodule-2.0 gobject-2.0 gtk-x11-2.0 \
- m pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png \
- pthread startup-notification-1 xfce4util z gcrypt gnutls \
- gpg-error tasn1 asn1 crypto gssapi krb5 pthread-stubs xcb
+WANTLIB += ICE SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext
+WANTLIB += Xfixes Xi Xinerama Xrandr Xrender asn1 atk-1.0 c cairo
+WANTLIB += crypto dbus-1 dbus-glib-1 execinfo expat fontconfig
+WANTLIB += freetype gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0
+WANTLIB += glitz gmodule-2.0 gobject-2.0 gssapi gtk-x11-2.0 krb5
+WANTLIB += m pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1
+WANTLIB += png pthread pthread-stubs ssl startup-notification-1
+WANTLIB += xcb xcb-atom xcb-aux xcb-event xfce4util z
.include <bsd.port.mk>