From 75126ff99b32a1081e30474f0e12d55e650596f8 Mon Sep 17 00:00:00 2001
From: Joe Marcus Clarke <marcus@FreeBSD.org>
Date: Sun, 13 Apr 2003 05:14:49 +0000
Subject: * Fix a problem where the help file could not be found [1] * Convert
 to the new GNOME infrastructure

PR:	50882 [1]
---
 mail/balsa2/Makefile               |  8 ++------
 mail/balsa2/files/patch-src_main.c | 17 +++++++++++++----
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/mail/balsa2/Makefile b/mail/balsa2/Makefile
index b72dea0fb903..02b0080dd6fa 100644
--- a/mail/balsa2/Makefile
+++ b/mail/balsa2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	balsa2
 PORTVERSION=	2.0.10
+PORTREVISION=	1
 CATEGORIES=	mail gnome
 MASTER_SITES=	http://www.theochem.kth.se/~pawsa/balsa/ \
 		ftp://ftp.newton.cx/pub/balsa/
@@ -20,9 +21,6 @@ LIB_DEPENDS=	ldap.2:${PORTSDIR}/net/openldap20 \
 		aspell.15:${PORTSDIR}/textproc/aspell \
 		pcre.0:${PORTSDIR}/devel/pcre \
 		esmtp.6:${PORTSDIR}/mail/libesmtp \
-		gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui \
-		gnomeprintui-2-2.0:${PORTSDIR}/x11-toolkits/libgnomeprintui \
-		gtkhtml-2.0:${PORTSDIR}/www/libgtkhtml \
 		gdbm.3:${PORTSDIR}/databases/gdbm
 RUN_DEPENDS=	${LOCALBASE}/bin/ispell:${PORTSDIR}/textproc/ispell
 
@@ -32,8 +30,7 @@ USE_LIBTOOL=	yes
 USE_PERL5=	yes
 USE_REINPLACE=	yes
 USE_OPENSSL=	yes
-USE_GNOMENG=	yes
-USE_GNOME=	gnomeprefix gnomehack
+USE_GNOME=	gnomeprefix gnomehack libgnomeui libgnomeprintui libgtkhtml
 LIBTOOLFILES=	libmutt/configure
 CONFIGURE_ARGS=	--enable-threads \
 		--enable-gtkhtml \
@@ -42,7 +39,6 @@ CONFIGURE_ARGS=	--enable-threads \
 		--with-ssl
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		LIBS="-L${LOCALBASE}/lib -liconv"
-CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
 MAN1=		balsa.1
 
diff --git a/mail/balsa2/files/patch-src_main.c b/mail/balsa2/files/patch-src_main.c
index b9511bc33d89..d7d48efb16aa 100644
--- a/mail/balsa2/files/patch-src_main.c
+++ b/mail/balsa2/files/patch-src_main.c
@@ -1,6 +1,15 @@
---- src/main.c.orig	Thu Jun 20 01:55:36 2002
-+++ src/main.c	Thu Jun 20 01:52:11 2002
-@@ -336,7 +336,7 @@
+--- src/main.c.orig	Mon Mar 24 16:48:36 2003
++++ src/main.c	Sun Apr 13 01:00:36 2003
+@@ -152,7 +152,7 @@
+     gnome_program_init(PACKAGE, VERSION, LIBGNOMEUI_MODULE, argc, argv,
+                        GNOME_PARAM_POPT_TABLE, options,
+                        GNOME_PARAM_APP_PREFIX, BALSA_STD_PREFIX,
+-                       GNOME_PARAM_APP_DATADIR, BALSA_STD_PREFIX "/share",
++                       GNOME_PARAM_APP_DATADIR, BALSA_STD_PREFIX "/share/gnome",
+                        NULL);
+ }
+ 
+@@ -355,7 +355,7 @@
      /* FIXME: gnome_i18n_get_language seems to have gone away; 
       * is this a reasonable replacement? */
      setlocale(LC_CTYPE,
@@ -8,4 +17,4 @@
 +              (const char *) gnome_i18n_get_language_list("LC_CTYPE")->data);
  #endif
  
- #ifdef BALSA_USE_THREADS
+ #ifdef HAVE_GPGME
-- 
cgit v1.2.3