Attachment 151039 Details for Bug 196305 – mail/faces diff

[patch] mail/faces diff

faces.diff (text/plain), 2.91 KB, created by Ashish SHUKLA on 2014-12-28 17:02:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ashish SHUKLA

Created: 2014-12-28 17:02:50 UTC

Size: 2.91 KB

patch

obsolete

>diff -urN /usr/ports/mail/faces/Makefile faces/Makefile
>--- /usr/ports/mail/faces/Makefile	2014-12-25 07:21:13.000000000 +0530
>+++ faces/Makefile	2014-12-28 22:30:29.282203071 +0530
>@@ -3,15 +3,21 @@
> 
> PORTNAME=	faces
> PORTVERSION=	1.7.7
>-PORTREVISION=	10
>+PORTREVISION=	11
> CATEGORIES=	mail
> MASTER_SITES=	SF
> 
> MAINTAINER=	ashish@FreeBSD.org
> COMMENT=	Visual mail, user, and print face server
> 
>-OPTIONS_DEFINE=	X11 NAS RPLAY SOX DOCS NLS
>+LICENSE=	GPLv2
>+LICENSE_FILE=	${WRKSRC}/COPYING
>+
>+OPTIONS_DEFINE=	X11 DOCS NLS AUDIO
> OPTIONS_DEFAULT=	X11
>+OPTIONS_SINGLE=		AUDIO
>+OPTIONS_SINGLE_AUDIO=	NAS RPLAY SOX
>+AUDIO_DESC=	Audio support
> X11_DESC=	X11/GTK support
> RPLAY_DESC=	rplay audio support
> SOX_DESC=	Sox audio support
>@@ -19,35 +25,32 @@
> NLS_USES=		gettext
> NLS_CONFIGURE_ENABLE=	nls
> 
>+OPTIONS_SUB=	X11
>+
>+X11_USE=	GNOME=gtk12
>+X11_CPPFLAGS=	-I../compface -I${LOCALBASE}/include
>+X11_LDFLAGS=	-L../compface -L${LOCALBASE}/lib
>+X11_CONFIGURE_ARGS=	--enable-imap --enable-pop \
>+		--enable-name-unknown --with-spooldir=/var/mail \
>+		--with-facedir=${DATADIR}
>+
>+NAS_CONFIGURE_ON=	--enable-audio --with-audio-cmd=${LOCALBASE}/bin/auplay
>+NAS_RUN_DEPENDS=	auplay:${PORTSDIR}/audio/nas
>+
>+SOX_CONFIGURE_ON=	--enable-audio --with-audio-cmd=${LOCALBASE}/bin/play
>+SOX_RUN_DEPENDS=	play:${PORTSDIR}/audio/sox
>+
>+RPLAY_CONFIGURE_ON=	--enable-audio --with-audio-cmd=${LOCALBASE}/bin/rplay
>+RPLAY_RUN_DEPENDS=	rplay:${PORTSDIR}/audio/rplay
>+
> USE_LDCONFIG=	yes
> 
> PORTDOCS=	README
> 
> .include <bsd.port.options.mk>
> 
>-.if ! ${PORT_OPTIONS:MX11}
>-PLIST_SUB+=	X11="@comment "
>-WITH_AUDIO=	# none
>-.else # with X11
>-PLIST_SUB+=	X11=""
>-USE_GNOME=	gtk12
>+.if ${PORT_OPTIONS:MX11}
> GNU_CONFIGURE=	yes
>-CPPFLAGS+=	-I../compface -I${LOCALBASE}/include
>-LDFLAGS+=	-L../compface -L${LOCALBASE}/lib
>-CONFIGURE_ARGS=	--enable-imap --enable-pop \
>-		--enable-name-unknown --with-spooldir=/var/mail \
>-		--with-facedir=${DATADIR}
>-.endif
>-
>-.ifdef WITH_NAS
>- CONFIGURE_ARGS+=	--enable-audio --with-audio-cmd=${LOCALBASE}/bin/auplay
>- RUN_DEPENDS=	auplay:${PORTSDIR}/audio/nas
>-.elifdef WITH_SOX
>- CONFIGURE_ARGS+=	--enable-audio --with-audio-cmd=${LOCALBASE}/bin/play
>- RUN_DEPENDS=	play:${PORTSDIR}/audio/sox
>-.elifdef WITH_RPLAY
>- CONFIGURE_ARGS+=	--enable-audio --with-audio-cmd=${LOCALBASE}/bin/rplay
>- RUN_DEPENDS=	rplay:${PORTSDIR}/audio/rplay
> .endif
> 
> # I have no better idea up to now
>@@ -57,11 +60,11 @@
> 	@${REINPLACE_CMD} -e "s%/usr/local/faces%${DATADIR}%g ; \
> 		 s%/var/spool/mail%/var/mail%g" ${WRKSRC}/faces/faces.man
> 	@${LN} -sf ${WRKSRC}/faces/faces.man ${WRKSRC}/faces/faces.1
>-.ifdef WITH_NAS
>+.if ${PORT_OPTIONS:MNAS}
> 	@${REINPLACE_CMD} -e "s%rplay%auplay%" ${WRKSRC}/faces/Faces.ad
>-.elifdef WITH_SOX
>+.elif ${PORT_OPTIONS:MSOX}
> 	@${REINPLACE_CMD} -e "s%rplay%play%" ${WRKSRC}/faces/Faces.ad
>-.elifdef WITH_RPLAY
>+.elif ${PORT_OPTIONS:MRPLAY}
> 	# nada
> .else
> 	@${REINPLACE_CMD} -e "s%^faces.audioSupport.*%faces.audioSupport:		false%" ${WRKSRC}/faces/Faces.ad

Actions: View | Diff

Attachments on bug 196305: 151039