Attachment 15667 Details for Bug 28963 – balsa.update.2

balsa.update.2

balsa.update.2 (text/plain), 5.21 KB, created by jmcoopr on 2001-07-19 00:05:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: jmcoopr

Created: 2001-07-19 00:05:44 UTC

Size: 5.21 KB

patch

obsolete

>diff -ruN balsa/Makefile balsa.new/Makefile
>--- balsa/Makefile	Tue Jun 19 02:42:54 2001
>+++ balsa.new/Makefile	Wed Jul 18 15:48:12 2001
>@@ -6,19 +6,21 @@
> #
> 
> PORTNAME=	balsa
>-PORTVERSION=	1.1.4
>-PORTREVISION=	2
>+PORTVERSION=	1.1.7
>+PORTREVISION=
> CATEGORIES=	mail gnome
> MASTER_SITES=	http://www.theochem.kth.se/~pawsa/balsa/ \
> 		ftp://ftp.newton.cx/pub/balsa/
> 
> MAINTAINER=	gnome@FreeBSD.org
> 
>-LIB_DEPENDS=	PropList.2:${PORTSDIR}/devel/libPropList
>+LIB_DEPENDS=	esmtp.5:${PORTSDIR}/mail/libesmtp
> 
> USE_X_PREFIX=	yes
>+USE_GMAKE=	yes
> USE_GNOME=	yes
> USE_LIBTOOL=	yes
>+USE_AUTOMAKE=	yes
> LIBTOOLFILES=	configure libmutt/configure
> CONFIGURE_ARGS=	--enable-threads \
> 		--enable-gtkhtml \
>@@ -27,15 +29,5 @@
> 		LIBS="-L${LOCALBASE}/lib -lgiconv"
> 
> MAN1=		balsa.1
>-
>-pre-patch:
>-	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
>-		 s|DATADIRNAME=lib|DATADIRNAME=share|g ; \
>-		 s|-liconv|-lgiconv|g ; s|iconv_open|libiconv_open|g' \
>-			${WRKSRC}/configure
>-	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
>-		's|\$$datadir$/gnome/|\$$datadir$/|g ; \
>-		 s|\$$datadir$/locale|\$$prefix$/share/locale|g ; \
>-		 s|\$$gnomedatadir$/gnome|\$$gnomedatadir$|g'
> 
> .include <bsd.port.mk>
>diff -ruN balsa/distinfo balsa.new/distinfo
>--- balsa/distinfo	Mon Apr 23 08:55:52 2001
>+++ balsa.new/distinfo	Fri Jul 13 17:48:09 2001
>@@ -1 +1 @@
>-MD5 (balsa-1.1.4.tar.gz) = 1ba025cefaae403cb099e61ac2acf356
>+MD5 (balsa-1.1.7.tar.gz) = 9a6cda3e70a8877308a4ff55da8dcec9
>diff -ruN balsa/files/patch-aa balsa.new/files/patch-aa
>--- balsa/files/patch-aa	Wed Feb  7 04:30:13 2001
>+++ balsa.new/files/patch-aa	Wed Jul 18 15:02:53 2001
>@@ -1,14 +1,19 @@
>-
>-$FreeBSD: ports/mail/balsa/files/patch-aa,v 1.2 2001/02/07 12:30:13 sobomax Exp $
>-
>---- src/Makefile.in.orig	Wed Feb  7 13:35:25 2001
>-+++ src/Makefile.in	Wed Feb  7 13:36:25 2001
>-@@ -152,7 +152,7 @@
>+--- configure.in	Fri Jul 13 02:09:44 2001
>++++ configure.in.new	Wed Jul 18 15:02:00 2001
>+@@ -458,12 +458,12 @@
>+ 	AC_MSG_RESULT([no])
>+ fi
>+ dnl #############################################################
>+-dnl Link with iconv for charset translation, if not found
>++dnl Link with giconv for charset translation, if not found
>+ dnl without library.  Needed for libmutt.
>+ dnl #############################################################
>+-AC_CHECK_LIB(iconv, iconv_open, , [
>+-	AC_CHECK_FUNC(iconv_open, , [
>+-			AC_MSG_ERROR([*** You need iconv for libmutt.])
>++AC_CHECK_LIB(giconv, libiconv_open, , [
>++	AC_CHECK_FUNC(libiconv_open, , [
>++			AC_MSG_ERROR([*** You need giconv for libmutt.])
>+ 			])
>+ 	])
>  
>- CFLAGS = @CFLAGS@ $(GTKHTML_CFLAGS) $(PIXBUF_FLAGS)
>- 
>--balsa_LDADD =  	$(top_builddir)/libbalsa/libbalsa.a		$(top_builddir)/libmutt/imap/libimap.a		$(top_builddir)/libmutt/libmutt.a		$(top_builddir)/libinit_balsa/libinit_balsa.a 	-lpspell 	-lltdl 	@LIBESD_LIB@ 	$(GNOME_LIBDIR) 	$(GNOMEUI_LIBS) 	$(INTLLIBS) 	$(PTHREAD_LIB) 	$(GNOME_PRINT_LIBS) 	$(GTKHTML_LIBS)		$(PIXBUF_LIBS)
>-+balsa_LDADD =  	$(top_builddir)/libbalsa/libbalsa.a		$(top_builddir)/libmutt/imap/libimap.a		$(top_builddir)/libmutt/libmutt.a		$(top_builddir)/libinit_balsa/libinit_balsa.a 	-lpspell 	@LIBESD_LIB@ 	$(GNOME_LIBDIR) 	$(GNOMEUI_LIBS) 	$(INTLLIBS) 	$(PTHREAD_LIB) 	$(GNOME_PRINT_LIBS) 	$(GTKHTML_LIBS)		$(PIXBUF_LIBS)
>- 
>- 
>- balsa_DEPENDENCIES =  	$(top_builddir)/libbalsa/libbalsa.a		$(top_builddir)/libmutt/libmutt.a	        $(top_builddir)/libmutt/imap/libimap.a		$(top_builddir)/libmutt/libmutt.a		$(top_builddir)/libinit_balsa/libinit_balsa.a
>diff -ruN balsa/files/patch-ab balsa.new/files/patch-ab
>--- balsa/files/patch-ab	Tue Sep 19 00:57:34 2000
>+++ balsa.new/files/patch-ab	Wed Jul 18 15:08:22 2001
>@@ -1,13 +1,11 @@
>---- configure	2000/09/19 07:22:11	1.1
>-+++ configure	2000/09/19 07:29:28
>-@@ -3480,8 +3480,8 @@
>- fi
>+--- Makefile.am	Fri Oct  6 12:19:22 2000
>++++ Makefile.am.new	Wed Jul 18 15:07:44 2001
>+@@ -5,7 +5,7 @@
>+ pixmapdir = $(gnomedatadir)/pixmaps
>+ pixmap_DATA = gnome-balsa2.png
>  
>+-desktopdir = $(gnomedatadir)/gnome/apps/Internet
>++desktopdir = $(gnomedatadir)/apps/Internet
>+ desktop_DATA = balsa.desktop
>  
>--LDFLAGS="$balsa_save_LDFLAGS"
>--LIBS="$balsa_save_LIBS"
>-+#LDFLAGS="$balsa_save_LDFLAGS"
>-+#LIBS="$balsa_save_LIBS"
>- 
>- for ac_hdr in libgnomeui/gnome-window-icon.h
>- do
>+ EXTRA_DIST = \
>diff -ruN balsa/files/patch-ac balsa.new/files/patch-ac
>--- balsa/files/patch-ac	Wed Dec 31 16:00:00 1969
>+++ balsa.new/files/patch-ac	Wed Jul 18 15:39:58 2001
>@@ -0,0 +1,11 @@
>+--- src/Makefile.am	Wed Jul 18 15:34:19 2001
>++++ src/Makefile.am.new	Wed Jul 18 15:35:32 2001
>+@@ -61,7 +61,7 @@
>+ balsa_SOURCES = $(balsa_BASE_SOURCES) $(balsa_IDL_SOURCES)
>+ 
>+ INCLUDES = \
>+-	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
>++	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" \
>+ 	-I$(top_srcdir) \
>+ 	-I$(top_srcdir)/libbalsa \
>+ 	-I$(top_srcdir)/libmutt \
>diff -ruN balsa/files/patch-aq balsa.new/files/patch-aq
>--- balsa/files/patch-aq	Mon Oct  2 04:02:02 2000
>+++ balsa.new/files/patch-aq	Wed Dec 31 16:00:00 1969
>@@ -1,12 +0,0 @@
>---- libbalsa/send.c.orig	Fri Sep 29 14:00:46 2000
>-+++ libbalsa/send.c	Mon Oct  2 13:23:37 2000
>-@@ -24,6 +24,9 @@
>- 
>- /* #include <radlib.h>  */
>- /* FreeBSD 4.1-STABLE FreeBSD 4.1-STABLE */
>-+#include <sys/types.h>
>-+#include <sys/socket.h>
>-+#include <netinet/in.h>
>- #include <arpa/inet.h>
>- #include <netdb.h>
>-

Actions: View

Attachments on bug 28963: 15667