Attachment 52172 Details for Bug 79074 – file.diff

[patch] file.diff

file.diff (text/plain), 3.76 KB, created by Jean-Yves Lefort on 2005-03-21 07:00:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jean-Yves Lefort

Created: 2005-03-21 07:00:12 UTC

Size: 3.76 KB

patch

obsolete

>diff -ruN /usr/ports/mail/sylpheed2/Makefile sylpheed2/Makefile
>--- /usr/ports/mail/sylpheed2/Makefile	Thu Mar 17 04:08:37 2005
>+++ sylpheed2/Makefile	Mon Mar 21 07:42:09 2005
>@@ -7,20 +7,18 @@
> 
> PORTNAME=	sylpheed
> PORTVERSION=	1.9.6
>-PORTREVISION=	0
>+PORTREVISION=	1
> CATEGORIES=	mail ipv6
>-MASTER_SITES=	${MASTER_SITE_LOCAL:S/$/:mime/} \
>-		http://sylpheed.good-day.net/sylpheed/v1.9/:source \
>-		${MASTER_SITE_SOURCEFORGE:S/$/:source/}
>-MASTER_SITE_SUBDIR=	sylpheed-claws/:source oliver/:mime
>+MASTER_SITES=	http://sylpheed.good-day.net/sylpheed/v1.9/ \
>+		${MASTER_SITE_SOURCEFORGE}
>+MASTER_SITE_SUBDIR=	sylpheed-claws/
> DISTNAME=	${PORTNAME}-${PORTVERSION:S/.r.1/rc/}
>-DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:source mime.types:mime
>-DIST_SUBDIR=	${PORTNAME}
>-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
> 
> MAINTAINER=	oliver@FreeBSD.org
> COMMENT=	A lightweight, featureful, and fast GTK+ based e-mail client
> 
>+RUN_DEPENDS=	${LOCALBASE}/etc/mime.types:${PORTSDIR}/misc/mime-support
>+
> USE_BZIP2=	yes
> USE_GETTEXT=	yes
> USE_GMAKE=	yes
>@@ -33,9 +31,7 @@
> 
> CONFIGURE_ENV=	CPPFLAGS="-I${PREFIX}/include -I${LOCALBASE}/include -I${X11BASE}/include" \
> 		LIBS="-L${PREFIX}/lib -L${LOCALBASE}/lib -L${X11BASE}/lib"
>-CONFIGURE_ARGS=	--enable-ipv6 \
>-		--prefix=${PREFIX} \
>-		--with-libintl-prefix=${LOCALBASE} \
>+CONFIGURE_ARGS=	--with-libintl-prefix=${LOCALBASE} \
> 		--program-transform-name=''
> 
> CONFLICTS=	sylpheed-1.[0-8]* sylpheed-gtk2-[0-9]*
>@@ -53,17 +49,13 @@
> .include "${PORTSDIR}/Mk/bsd.openssl.mk"
> CONFIGURE_ARGS+=--enable-ssl
> .endif
>-
> .if defined(WITH_GPGME)
> LIB_DEPENDS+=	gpgme.14:${PORTSDIR}/security/gpgme
> RUN_DEPENDS+=	gpg:${PORTSDIR}/security/gnupg
> CONFIGURE_ARGS+=--enable-gpgme
>-.else
>-CONFIGURE_ARGS+=--disable-gpgme
> .endif
> .if defined(WITH_COMPFACE)
> LIB_DEPENDS+=	compface.1:${PORTSDIR}/mail/faces
>-CONFIGURE_ARGS+=--enable-compface
> .else
> CONFIGURE_ARGS+=--disable-compface
> .endif
>@@ -71,19 +63,10 @@
> LIB_DEPENDS+=	pisock.8:${PORTSDIR}/palm/pilot-link
> RUN_DEPENDS+=	jpilot:${PORTSDIR}/palm/jpilot
> CONFIGURE_ARGS+=--enable-jpilot
>-.else
>-CONFIGURE_ARGS+=--disable-jpilot
> .endif
> .if defined(WITH_LDAP)
> USE_OPENLDAP=	yes
> CONFIGURE_ARGS+=--enable-ldap
>-.else
>-CONFIGURE_ARGS+=--disable-ldap
>-.endif
>-.if !defined(WITHOUT_SSL)
>-CONFIGURE_ARGS+=--enable-ssl
>-.else
>-CONFIGURE_ARGS+=--disable-ssl
> .endif
> 
> MAKEFILES=	Makefile.in ac/Makefile.in faq/Makefile.in faq/de/Makefile.in \
>@@ -94,7 +77,7 @@
> post-patch:
> 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS:S/"//g}|g; \
> 		s|-lresolv||g; s|-lpisock\"|-liconv &|g; ' ${WRKSRC}/configure
>-	@${REINPLACE_CMD} -e 's|mime\.types|sylpheed-mime\.types|g' \
>+	@${REINPLACE_CMD} -e 's|/etc|${LOCALBASE}&|' \
> 		${WRKSRC}/src/procmime.c
> 
> .if defined(NOPORTDOCS)
>@@ -118,7 +101,6 @@
> 	@${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
> 	@${INSTALL_DATA} ${WRKSRC}/${i}.ja ${DOCSDIR}
> .endfor
>-	@${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/mime.types ${PREFIX}/etc/sylpheed-mime.types
> .endif
> 
> .include <bsd.port.post.mk>
>diff -ruN /usr/ports/mail/sylpheed2/distinfo sylpheed2/distinfo
>--- /usr/ports/mail/sylpheed2/distinfo	Thu Mar 17 04:08:37 2005
>+++ sylpheed2/distinfo	Mon Mar 21 07:24:44 2005
>@@ -1,4 +1,2 @@
>-MD5 (sylpheed/sylpheed-1.9.6.tar.bz2) = 1cdee69bd724f20786e5390891eb4c23
>-SIZE(sylpheed/sylpheed-1.9.6.tar.bz2) = 2226203
>-MD5 (sylpheed/mime.types) = 7c0563d85e2e830c0266d54517ad62e8
>-SIZE(sylpheed/mime.types) = 14979
>+MD5 (sylpheed-1.9.6.tar.bz2) = 1cdee69bd724f20786e5390891eb4c23
>+SIZE (sylpheed-1.9.6.tar.bz2) = 2226203
>diff -ruN /usr/ports/mail/sylpheed2/pkg-plist sylpheed2/pkg-plist
>--- /usr/ports/mail/sylpheed2/pkg-plist	Wed Feb  9 16:55:32 2005
>+++ sylpheed2/pkg-plist	Mon Mar 21 07:17:36 2005
>@@ -1,5 +1,4 @@
> bin/sylpheed
>-etc/sylpheed-mime.types
> %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
> %%PORTDOCS%%%%DOCSDIR%%/ChangeLog.ja
> %%PORTDOCS%%%%DOCSDIR%%/INSTALL

Actions: View | Diff

Attachments on bug 79074: 52171 | 52172