Various patches (mainly shared library revision changes) for those

ports that depend on GNOME and need to change for 1.4

6 files changed, 14 insertions, 48 deletions

diff --git a/mail/balsa/Makefile b/mail/balsa/Makefile
index 27f21c5114ae..f8aae3493ce6 100644
--- a/mail/balsa/Makefile
+++ b/mail/balsa/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	balsa
 PORTVERSION=	1.1.4
-#PORTREVISION=	1
+PORTREVISION=	1
 CATEGORIES=	mail gnome
 MASTER_SITES=	http://www.theochem.kth.se/~pawsa/balsa/ \
 		ftp://ftp.newton.cx/pub/balsa/
@@ -15,10 +15,7 @@ MASTER_SITES=	http://www.theochem.kth.se/~pawsa/balsa/ \
 MAINTAINER=	sobomax@FreeBSD.org
 
 LIB_DEPENDS=	PropList.2:${PORTSDIR}/devel/libPropList \
-		pspell.4:${PORTSDIR}/textproc/pspell \
-		gnomeprint.13:${PORTSDIR}/print/gnomeprint \
-		giconv.2:${PORTSDIR}/converters/libiconv \
-		gtkhtml.8:${PORTSDIR}/www/gtkhtml
+		gtkhtml.10:${PORTSDIR}/www/gtkhtml
 
 USE_X_PREFIX=	yes
 USE_GNOME=	yes
diff --git a/mail/balsa2/Makefile b/mail/balsa2/Makefile
index 27f21c5114ae..f8aae3493ce6 100644
--- a/mail/balsa2/Makefile
+++ b/mail/balsa2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	balsa
 PORTVERSION=	1.1.4
-#PORTREVISION=	1
+PORTREVISION=	1
 CATEGORIES=	mail gnome
 MASTER_SITES=	http://www.theochem.kth.se/~pawsa/balsa/ \
 		ftp://ftp.newton.cx/pub/balsa/
@@ -15,10 +15,7 @@ MASTER_SITES=	http://www.theochem.kth.se/~pawsa/balsa/ \
 MAINTAINER=	sobomax@FreeBSD.org
 
 LIB_DEPENDS=	PropList.2:${PORTSDIR}/devel/libPropList \
-		pspell.4:${PORTSDIR}/textproc/pspell \
-		gnomeprint.13:${PORTSDIR}/print/gnomeprint \
-		giconv.2:${PORTSDIR}/converters/libiconv \
-		gtkhtml.8:${PORTSDIR}/www/gtkhtml
+		gtkhtml.10:${PORTSDIR}/www/gtkhtml
 
 USE_X_PREFIX=	yes
 USE_GNOME=	yes
diff --git a/mail/evolution-devel/Makefile b/mail/evolution-devel/Makefile
index 27e523c4d363..7db0c933dc4f 100644
--- a/mail/evolution-devel/Makefile
+++ b/mail/evolution-devel/Makefile
@@ -7,26 +7,15 @@
 
 PORTNAME=	evolution
 PORTVERSION=	0.9
+PORTREVISION=	1
 CATEGORIES=	mail gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	unstable/sources/evolution
 
 MAINTAINER=	sobomax@FreeBSD.org
 
-# Note: gnomepilot support has been forcibly taken out for now, so
-# we can save ourselves a little bit of build time
-
-LIB_DEPENDS=	xml.5:${PORTSDIR}/textproc/libxml \
-		glade.4:${PORTSDIR}/devel/libglade \
-		gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf \
-		gnomeprint.13:${PORTSDIR}/print/gnomeprint \
-		oaf.0:${PORTSDIR}/devel/oaf \
-		bonobo.2:${PORTSDIR}/devel/bonobo \
-		gnomevfs.0:${PORTSDIR}/devel/gnomevfs \
-		unicode.0:${PORTSDIR}/devel/libunicode \
-		gtkhtml.8:${PORTSDIR}/www/gtkhtml \
-		ldap.1:${PORTSDIR}/net/openldap # \
-#		gpilotd.0:${PORTSDIR}/palm/gnomepilot
+LIB_DEPENDS=	gtkhtml.10:${PORTSDIR}/www/gtkhtml \
+		ldap.1:${PORTSDIR}/net/openldap
 
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index 27e523c4d363..7db0c933dc4f 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -7,26 +7,15 @@
 
 PORTNAME=	evolution
 PORTVERSION=	0.9
+PORTREVISION=	1
 CATEGORIES=	mail gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	unstable/sources/evolution
 
 MAINTAINER=	sobomax@FreeBSD.org
 
-# Note: gnomepilot support has been forcibly taken out for now, so
-# we can save ourselves a little bit of build time
-
-LIB_DEPENDS=	xml.5:${PORTSDIR}/textproc/libxml \
-		glade.4:${PORTSDIR}/devel/libglade \
-		gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf \
-		gnomeprint.13:${PORTSDIR}/print/gnomeprint \
-		oaf.0:${PORTSDIR}/devel/oaf \
-		bonobo.2:${PORTSDIR}/devel/bonobo \
-		gnomevfs.0:${PORTSDIR}/devel/gnomevfs \
-		unicode.0:${PORTSDIR}/devel/libunicode \
-		gtkhtml.8:${PORTSDIR}/www/gtkhtml \
-		ldap.1:${PORTSDIR}/net/openldap # \
-#		gpilotd.0:${PORTSDIR}/palm/gnomepilot
+LIB_DEPENDS=	gtkhtml.10:${PORTSDIR}/www/gtkhtml \
+		ldap.1:${PORTSDIR}/net/openldap
 
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
diff --git a/mail/pmail/Makefile b/mail/pmail/Makefile
index d13506635b68..189168f6d5cc 100644
--- a/mail/pmail/Makefile
+++ b/mail/pmail/Makefile
@@ -7,21 +7,18 @@
 
 PORTNAME=	pmail
 PORTVERSION=	0.5.3
+PORTREVISION=	1
 CATEGORIES=	mail python gnome
 MASTER_SITES=	http://www.toad.net/~sbender/pmail/
 
 MAINTAINER=	sobomax@FreeBSD.org
 
 BUILD_DEPENDS=	${PYTHON_LIBDIR}/site-packages/_gnomemodule.so:${PORTSDIR}/x11-toolkits/py-gnome
-LIB_DEPENDS=	glade.4:${PORTSDIR}/devel/libglade
 RUN_DEPENDS=	${PYTHON_LIBDIR}/site-packages/_gnomemodule.so:${PORTSDIR}/x11-toolkits/py-gnome
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_PYTHON=	yes
 USE_GNOME=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
 
 .include <bsd.port.mk>
diff --git a/mail/stuphead/Makefile b/mail/stuphead/Makefile
index 86c1c06d9a40..12a1ff1406aa 100644
--- a/mail/stuphead/Makefile
+++ b/mail/stuphead/Makefile
@@ -7,20 +7,17 @@
 
 PORTNAME=	stuphead
 PORTVERSION=	0.4.9
-CATEGORIES=	mail
+PORTREVISION=	1
+CATEGORIES=	mail gnome
 MASTER_SITES=	http://stuphead.antex.ru/
 
 MAINTAINER=	ozz@FreeBSD.org.ru
 
-LIB_DEPENDS=	gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf
-
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_GTK=	yes
+USE_GNOME=	yes
 USE_LIBTOOL=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
 
 pre-patch:
 	@${PERL} -pi -e 's#DATADIRNAME=lib#DATADIRNAME=share#g' \