Attachment 112006 Details for Bug 153352 – claws-mail-3.7.8.patch

[patch] claws-mail-3.7.8.patch

claws-mail-3.7.8.patch (text/plain), 5.39 KB, created by Pawel Pekala on 2010-12-21 20:30:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pawel Pekala

Created: 2010-12-21 20:30:11 UTC

Size: 5.39 KB

patch

obsolete

>diff -ruN --exclude=CVS /usr/ports/mail/claws-mail/Makefile /home/corn/devel/claws-mail/Makefile
>--- /usr/ports/mail/claws-mail/Makefile	2010-12-16 09:19:15.000000000 +0100
>+++ /home/corn/devel/claws-mail/Makefile	2010-12-21 21:16:18.000000000 +0100
>@@ -13,7 +13,6 @@
> MAINTAINER=	c0rn@o2.pl
> COMMENT=	A lightweight and very featureful GTK+ based e-mail and news client
> 
>-BUILD_DEPENDS=	${LOCALBASE}/bin/docbook2html:${PORTSDIR}/textproc/docbook-utils
> LIB_DEPENDS=	etpan:${PORTSDIR}/mail/libetpan \
> 		cairo:${PORTSDIR}/graphics/cairo \
> 		expat:${PORTSDIR}/textproc/expat2 \
>@@ -26,6 +25,8 @@
> 
> CONFLICTS=	sylpheed-claws
> 
>+LICENSE=	GPLv3
>+
> USE_BZIP2=	yes
> USE_GETTEXT=	yes
> USE_GMAKE=	yes
>@@ -40,16 +41,14 @@
> 
> MAN1=		claws-mail.1
> 
>-CONFIGURE_ARGS=	\
>-		--with-libiconv-prefix=${LOCALBASE} \
>-		--with-manualdir=${DOCSDIR}/manual \
>+CONFIGURE_ARGS=	--with-libiconv-prefix=${LOCALBASE}
> 
> CONFIGURE_ENV=	CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \
> 		CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
> 		LDFLAGS="-L${LOCALBASE}/lib" \
> 		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
> 
>-OPTIONS=	ALL		"Enable all options except GNUTLS."			off \
>+OPTIONS=	ALL		"Enable all options."			off \
> 		ENCHANT		"Enable spell checking support."	on \
> 		BOGOFILTER	"Enable bogofilter support."		off \
> 		COMPFACE	"Enable X-Face support."		on \
>@@ -59,6 +58,7 @@
> 		IPV6		"Enable ipv6 support."			on \
> 		JPILOT		"Enable JPilot support."		off \
> 		LDAP		"Enable LDAP support."			off \
>+		MANUAL		"Build and install manual files"	on \
> 		SA_PLUG		"Enable SpamAssassin support."		off \
> 		STARTUP		"Enable startup notification support."	on \
> 		THEMES		"Install additional themes."		on
>@@ -99,6 +99,14 @@
> .else
> CONFIGURE_ARGS+=	--disable-ldap
> .endif
>+.if defined(WITH_MANUAL) || defined(WITH_ALL)
>+BUILD_DEPENDS=	${LOCALBASE}/bin/docbook2html:${PORTSDIR}/textproc/docbook-utils
>+CONFIGURE_ARGS+=	--enable-manual --with-manualdir=${DOCSDIR}/manual
>+PLIST_SUB+=		MANUAL=""
>+.else
>+CONFIGURE_ARGS+=	--disable-manual
>+PLIST_SUB+=		MANUAL="@comment "
>+.endif
> .if defined(WITH_SA_PLUG) || defined(WITH_ALL)
> RUN_DEPENDS+=		spamd:${PORTSDIR}/mail/p5-Mail-SpamAssassin
> CONFIGURE_ARGS+=	--enable-spamassassin-plugin
>@@ -162,6 +170,7 @@
> 
> post-install:
> .if !defined(NOPORTDOCS)
>+	@${MKDIR} ${DOCSDIR}
> .for i in NEWS RELEASE_NOTES README TODO
> 	@${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
> .endfor
>diff -ruN --exclude=CVS /usr/ports/mail/claws-mail/pkg-plist /home/corn/devel/claws-mail/pkg-plist
>--- /usr/ports/mail/claws-mail/pkg-plist	2010-12-16 09:19:15.000000000 +0100
>+++ /home/corn/devel/claws-mail/pkg-plist	2010-12-16 17:34:02.000000000 +0100
>@@ -277,26 +277,26 @@
> %%PORTDOCS%%%%DOCSDIR%%/README.tools
> %%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES
> %%PORTDOCS%%%%DOCSDIR%%/TODO
>-%%DOCSDIR%%/manual/de/claws-mail-manual.html
>-%%DOCSDIR%%/manual/de/claws-mail-manual.pdf
>-%%DOCSDIR%%/manual/de/claws-mail-manual.ps
>-%%DOCSDIR%%/manual/de/claws-mail-manual.txt
>-%%DOCSDIR%%/manual/en/claws-mail-manual.html
>-%%DOCSDIR%%/manual/en/claws-mail-manual.pdf
>-%%DOCSDIR%%/manual/en/claws-mail-manual.ps
>-%%DOCSDIR%%/manual/en/claws-mail-manual.txt
>-%%DOCSDIR%%/manual/es/claws-mail-manual.html
>-%%DOCSDIR%%/manual/es/claws-mail-manual.pdf
>-%%DOCSDIR%%/manual/es/claws-mail-manual.ps
>-%%DOCSDIR%%/manual/es/claws-mail-manual.txt
>-%%DOCSDIR%%/manual/fr/claws-mail-manual.html
>-%%DOCSDIR%%/manual/fr/claws-mail-manual.pdf
>-%%DOCSDIR%%/manual/fr/claws-mail-manual.ps
>-%%DOCSDIR%%/manual/fr/claws-mail-manual.txt
>-%%DOCSDIR%%/manual/pl/claws-mail-manual.html
>-%%DOCSDIR%%/manual/pl/claws-mail-manual.pdf
>-%%DOCSDIR%%/manual/pl/claws-mail-manual.ps
>-%%DOCSDIR%%/manual/pl/claws-mail-manual.txt
>+%%MANUAL%%%%DOCSDIR%%/manual/de/claws-mail-manual.html
>+%%MANUAL%%%%DOCSDIR%%/manual/de/claws-mail-manual.pdf
>+%%MANUAL%%%%DOCSDIR%%/manual/de/claws-mail-manual.ps
>+%%MANUAL%%%%DOCSDIR%%/manual/de/claws-mail-manual.txt
>+%%MANUAL%%%%DOCSDIR%%/manual/en/claws-mail-manual.html
>+%%MANUAL%%%%DOCSDIR%%/manual/en/claws-mail-manual.pdf
>+%%MANUAL%%%%DOCSDIR%%/manual/en/claws-mail-manual.ps
>+%%MANUAL%%%%DOCSDIR%%/manual/en/claws-mail-manual.txt
>+%%MANUAL%%%%DOCSDIR%%/manual/es/claws-mail-manual.html
>+%%MANUAL%%%%DOCSDIR%%/manual/es/claws-mail-manual.pdf
>+%%MANUAL%%%%DOCSDIR%%/manual/es/claws-mail-manual.ps
>+%%MANUAL%%%%DOCSDIR%%/manual/es/claws-mail-manual.txt
>+%%MANUAL%%%%DOCSDIR%%/manual/fr/claws-mail-manual.html
>+%%MANUAL%%%%DOCSDIR%%/manual/fr/claws-mail-manual.pdf
>+%%MANUAL%%%%DOCSDIR%%/manual/fr/claws-mail-manual.ps
>+%%MANUAL%%%%DOCSDIR%%/manual/fr/claws-mail-manual.txt
>+%%MANUAL%%%%DOCSDIR%%/manual/pl/claws-mail-manual.html
>+%%MANUAL%%%%DOCSDIR%%/manual/pl/claws-mail-manual.pdf
>+%%MANUAL%%%%DOCSDIR%%/manual/pl/claws-mail-manual.ps
>+%%MANUAL%%%%DOCSDIR%%/manual/pl/claws-mail-manual.txt
> share/icons/hicolor/128x128/apps/claws-mail-128x128.png
> share/icons/hicolor/48x48/apps/claws-mail.png
> share/icons/hicolor/64x64/apps/claws-mail-64x64.png
>@@ -325,12 +325,12 @@
> share/pixmaps/claws-mail-64x64.png
> share/pixmaps/claws-mail.png
> @dirrm %%DATADIR%%
>-@dirrm %%DOCSDIR%%/manual/pl
>-@dirrm %%DOCSDIR%%/manual/fr
>-@dirrm %%DOCSDIR%%/manual/es
>-@dirrm %%DOCSDIR%%/manual/en
>-@dirrm %%DOCSDIR%%/manual/de
>-@dirrm %%DOCSDIR%%/manual
>+%%MANUAL%%@dirrm %%DOCSDIR%%/manual/pl
>+%%MANUAL%%@dirrm %%DOCSDIR%%/manual/fr
>+%%MANUAL%%@dirrm %%DOCSDIR%%/manual/es
>+%%MANUAL%%@dirrm %%DOCSDIR%%/manual/en
>+%%MANUAL%%@dirrm %%DOCSDIR%%/manual/de
>+%%MANUAL%%@dirrm %%DOCSDIR%%/manual
> @dirrmtry %%DOCSDIR%%
> @dirrmtry share/applications
> @dirrmtry lib/claws-mail/plugins

Actions: View | Diff

Attachments on bug 153352: 112006