Attachment #15842 for bug #29261

View | Details | Raw Unified | Return to bug 29261
Collapse All | Expand All




# Date created:				02 December 1998
# Whom:					Glenn Johnson <gljohns@bellsouth.net>
#
# $FreeBSD: ports/mail/balsa/Makefile,v 1.46 2001/06/19 09:42:54 ade Exp $
#

PORTNAME=	balsa
PORTVERSION=	1.1.7
PORTREVISION=	1
CATEGORIES=	mail gnome
MASTER_SITES=	http://www.theochem.kth.se/~pawsa/balsa/ \
		ftp://ftp.newton.cx/pub/balsa/

LIB_DEPENDS=	esmtp.5:${PORTSDIR}/mail/libesmtp

USE_X_PREFIX=	yes
USE_GMAKE=	yes
USE_GNOME=	yes
USE_LIBTOOL=	yes
USE_AUTOMAKE=	yes
RESTRICTED=	"Now uses US-only libcipher"
RESTRICTED_FILES=	${PATCHDIR}/patch-src::Makefile.am
LIBTOOLFILES=	configure libmutt/configure
CONFIGURE_ARGS=	--enable-threads \
		--enable-gtkhtml \
		--disable-more-warnings
CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
		LIBS="-L${LOCALBASE}/lib"

MAN1=		balsa.1

.include <bsd.port.pre.mk>

.if defined(WITH_BALSA_LDAP)
LIB_DEPENDS+=	ldap.1:${PORTSDIR}/net/openldap
CONFIGURE_ARGS+=--enable-ldap
.endif

.if defined(WITH_BALSA_SSL)
USE_OPENSSL=	yes
CONFIGURE_ARGS+=--with-ssl
.endif

pre-patch:
.if !defined(USA_RESIDENT)
	@${ECHO} "Removing libcipher linkage:  non-USA_RESIDENT"
	${RM} -f ${RESTRICTED_FILES}
.endif

pre-extract:
	@${ECHO}
	@${ECHO} "              Available build options:"
	@${ECHO} "====================================================="
	@${ECHO}
	@${ECHO} "WITH_BALSA_LDAP -- Build with LDAP addressing support"
	@${ECHO} "WITH_BALSA_SSL -- Build with OPENSSL login support"
	@${ECHO} "USA_RESIDENT -- links U.S.-only libcipher"
	@${ECHO}

.include <bsd.port.post.mk>

Line 0 Link Here

(-)balsa.new/files/patch-Makefile.am (+11 lines)
	1	--- Makefile.am Fri Oct 6 12:19:22 2000
	2	+++ Makefile.am.new Wed Jul 18 15:07:44 2001
	3	@@ -5,7 +5,7 @@
	4	pixmapdir = $(gnomedatadir)/pixmaps
	5	pixmap_DATA = gnome-balsa2.png
	6
	7	-desktopdir = $(gnomedatadir)/gnome/apps/Internet
	8	+desktopdir = $(gnomedatadir)/apps/Internet
	9	desktop_DATA = balsa.desktop
	10
	11	EXTRA_DIST = \





$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 @@
 
 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




--- configure	2000/09/19 07:22:11	1.1
+++ configure	2000/09/19 07:29:28
@@ -3480,8 +3480,8 @@
 fi
 
 
-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




--- configure.in	Fri Jul 13 02:09:44 2001
+++ configure.in.new	Thu Jul 26 22:03: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.])
 			])
 	])
 

Line 0 Link Here

(-)balsa.new/files/patch-help-C::Makefile.am (+11 lines)
	1	--- help/C/Makefile.am Wed May 23 01:38:59 2001
	2	+++ help/C/Makefile.am.new Thu Jul 26 12:48:28 2001
	3	@@ -6,7 +6,7 @@
	4	win-config-gen \
	5	$(SGML_FILES)
	6
	7	-balsa_helpdir = $(gnomedatadir)/gnome/help/balsa/C
	8	+balsa_helpdir = $(gnomedatadir)/help/balsa/C
	9
	10	balsa_help_DATA = \
	11	topic.dat \

Line 0 Link Here

(-)balsa.new/files/patch-libbalsa::pop3.c (+11 lines)
	1	--- libbalsa/pop3.c Fri Jul 13 01:45:04 2001
	2	+++ libbalsa/pop3.c.new Tue Jul 24 17:40:42 2001
	3	@@ -507,7 +507,7 @@
	4
	5	err = fetch_single_msg(s, msg, i, first_msg, msgs, &num_bytes,
	6	tot_bytes, prog_cb);
	7	- if (fclose (msg) != 0 && err == POP_OK) err = POP_PROCMAIL_ERR;
	8	+ if (pclose (msg) != 0 && err == POP_OK) err = POP_PROCMAIL_ERR;
	9
	10	if (err != POP_OK) break; /* the 'for' loop */
	11	if (delete_on_server) delete_msg(s, i); /* ignore errors */




--- src/Makefile.am	Thu Jul 12 00:08:46 2001
+++ src/Makefile.am.new	Fri Jul 20 15:14:11 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 \
@@ -76,6 +76,7 @@
 	$(top_builddir)/libinit_balsa/libinit_balsa.a \
 	-lpspell \
 	-lltdl \
+	-lcipher \
 	@LIBESD_LIB@ \
 	$(GNOME_LIBDIR) \
 	$(GNOMEUI_LIBS) \

Return to bug 29261

Lines 2-12 Link Here

(-)balsa.new/Makefile (-13 / +35 lines)
2	# Date created: 02 December 1998	2	# Date created: 02 December 1998
3	# Whom: Glenn Johnson <gljohns@bellsouth.net>	3	# Whom: Glenn Johnson <gljohns@bellsouth.net>
4	#	4	#
5	# $FreeBSD: ports/mail/balsa/Makefile,v 1.47 2001/07/20 12:09:05 sobomax Exp $	5	# $FreeBSD: ports/mail/balsa/Makefile,v 1.46 2001/06/19 09:42:54 ade Exp $
6	#	6	#
7		7
8	PORTNAME= balsa	8	PORTNAME= balsa
9	PORTVERSION= 1.1.7	9	PORTVERSION= 1.1.7
		10	PORTREVISION= 1
10	CATEGORIES= mail gnome	11	CATEGORIES= mail gnome
11	MASTER_SITES= http://www.theochem.kth.se/~pawsa/balsa/ \	12	MASTER_SITES= http://www.theochem.kth.se/~pawsa/balsa/ \
12	ftp://ftp.newton.cx/pub/balsa/	13	ftp://ftp.newton.cx/pub/balsa/
Lines 16-40 Link Here
16	LIB_DEPENDS= esmtp.5:${PORTSDIR}/mail/libesmtp	17	LIB_DEPENDS= esmtp.5:${PORTSDIR}/mail/libesmtp
17		18
18	USE_X_PREFIX= yes	19	USE_X_PREFIX= yes
		20	USE_GMAKE= yes
19	USE_GNOME= yes	21	USE_GNOME= yes
20	USE_LIBTOOL= yes	22	USE_LIBTOOL= yes
21	LIBTOOLFILES= libmutt/configure	23	USE_AUTOMAKE= yes
		24	RESTRICTED= "Now uses US-only libcipher"
		25	RESTRICTED_FILES= ${PATCHDIR}/patch-src::Makefile.am
		26	LIBTOOLFILES= configure libmutt/configure
22	CONFIGURE_ARGS= --enable-threads \	27	CONFIGURE_ARGS= --enable-threads \
23	--enable-gtkhtml \	28	--enable-gtkhtml \
24	--disable-more-warnings	29	--disable-more-warnings
25	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \	30	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
26	LIBS="-L${LOCALBASE}/lib -lgiconv"	31	LIBS="-L${LOCALBASE}/lib"
27
28	MAN1= balsa.1	32	MAN1= balsa.1
29		33
		34	.include <bsd.port.pre.mk>
		35
		36	.if defined(WITH_BALSA_LDAP)
		37	LIB_DEPENDS+= ldap.1:${PORTSDIR}/net/openldap
		38	CONFIGURE_ARGS+=--enable-ldap
		39	.endif
		40
		41	.if defined(WITH_BALSA_SSL)
		42	USE_OPENSSL= yes
		43	CONFIGURE_ARGS+=--with-ssl
		44	.endif
		45
30	pre-patch:	46	pre-patch:
31	@${PERL} -pi -e 's\|-lpthread\|${PTHREAD_LIBS}\|g ; \	47	.if !defined(USA_RESIDENT)
32	s\|DATADIRNAME=lib\|DATADIRNAME=share\|g ; \	48	@${ECHO} "Removing libcipher linkage: non-USA_RESIDENT"
33	s\|-liconv\|-lgiconv\|g ; s\|iconv_open\|libiconv_open\|g' \	49	${RM} -f ${RESTRICTED_FILES}
34	${WRKSRC}/configure	50	.endif
35	@find ${WRKSRC} -name "Makefile.in" \| xargs ${PERL} -pi -e \	51
36	's\|\$\(datadir\)/gnome/\|\$\(datadir\)/\|g ; \	52	pre-extract:
37	s\|\$\(datadir\)/locale\|\$\(prefix\)/share/locale\|g ; \	53	@${ECHO}
38	s\|\$\(gnomedatadir\)/gnome\|\$\(gnomedatadir\)\|g'	54	@${ECHO} " Available build options:"
		55	@${ECHO} "====================================================="
		56	@${ECHO}
		57	@${ECHO} "WITH_BALSA_LDAP -- Build with LDAP addressing support"
		58	@${ECHO} "WITH_BALSA_SSL -- Build with OPENSSL login support"
		59	@${ECHO} "USA_RESIDENT -- links U.S.-only libcipher"
		60	@${ECHO}
39		61
40	.include <bsd.port.mk>	62	.include <bsd.port.post.mk>

Lines 1-14 Link Here

(-)balsa.new/files/patch-aa (-14 lines)
1
2	$FreeBSD: ports/mail/balsa/files/patch-aa,v 1.2 2001/02/07 12:30:13 sobomax Exp $
3
4	--- src/Makefile.in.orig Wed Feb 7 13:35:25 2001
5	+++ src/Makefile.in Wed Feb 7 13:36:25 2001
6	@@ -152,7 +152,7 @@
7
8	CFLAGS = @CFLAGS@ $(GTKHTML_CFLAGS) $(PIXBUF_FLAGS)
9
10	-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)
11	+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)
12
13
14	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

Lines 1-13 Link Here

(-)balsa.new/files/patch-ab (-13 lines)
1	--- configure 2000/09/19 07:22:11 1.1
2	+++ configure 2000/09/19 07:29:28
3	@@ -3480,8 +3480,8 @@
4	fi
5
6
7	-LDFLAGS="$balsa_save_LDFLAGS"
8	-LIBS="$balsa_save_LIBS"
9	+#LDFLAGS="$balsa_save_LDFLAGS"
10	+#LIBS="$balsa_save_LIBS"
11
12	for ac_hdr in libgnomeui/gnome-window-icon.h
13	do

Line 0 Link Here

(-)balsa.new/files/patch-configure.in (+19 lines)
	1	--- configure.in Fri Jul 13 02:09:44 2001
	2	+++ configure.in.new Thu Jul 26 22:03:00 2001
	3	@@ -458,12 +458,12 @@
	4	AC_MSG_RESULT([no])
	5	fi
	6	dnl #############################################################
	7	-dnl Link with iconv for charset translation, if not found
	8	+dnl Link with giconv for charset translation, if not found
	9	dnl without library. Needed for libmutt.
	10	dnl #############################################################
	11	-AC_CHECK_LIB(iconv, iconv_open, , [
	12	- AC_CHECK_FUNC(iconv_open, , [
	13	- AC_MSG_ERROR([*** You need iconv for libmutt.])
	14	+AC_CHECK_LIB(giconv, libiconv_open, , [
	15	+ AC_CHECK_FUNC(libiconv_open, , [
	16	+ AC_MSG_ERROR([*** You need giconv for libmutt.])
	17	])
	18	])
	19

Line 0 Link Here

(-)balsa.new/files/patch-src::Makefile.am (+19 lines)
	1	--- src/Makefile.am Thu Jul 12 00:08:46 2001
	2	+++ src/Makefile.am.new Fri Jul 20 15:14:11 2001
	3	@@ -61,7 +61,7 @@
	4	balsa_SOURCES = $(balsa_BASE_SOURCES) $(balsa_IDL_SOURCES)
	5
	6	INCLUDES = \
	7	- -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
	8	+ -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" \
	9	-I$(top_srcdir) \
	10	-I$(top_srcdir)/libbalsa \
	11	-I$(top_srcdir)/libmutt \
	12	@@ -76,6 +76,7 @@
	13	$(top_builddir)/libinit_balsa/libinit_balsa.a \
	14	-lpspell \
	15	-lltdl \
	16	+ -lcipher \
	17	@LIBESD_LIB@ \
	18	$(GNOME_LIBDIR) \
	19	$(GNOMEUI_LIBS) \