diff options
author | Volker Stolz <vs@FreeBSD.org> | 2005-05-10 08:53:17 +0000 |
---|---|---|
committer | Volker Stolz <vs@FreeBSD.org> | 2005-05-10 08:53:17 +0000 |
commit | 5f35726c43458e6a17511fab92fcac14b5926663 (patch) | |
tree | 8f80086c91527f315853cef398834d58578d1ff3 /mail/faces | |
parent | Fix build with rrdtool 1.2.x. (diff) |
- Use OPTIONS:
Toggle default audio-support to disabled, mostly to avoid that mutt-print
pulls in audio-support via faces which I suspect nobody is using anyway
- Drop unused patch
- Bump PORTREVISION to make the cluster pick up the changed default set of
options/dependencies
Requested by: BSD-AC users group
Notes
Notes:
svn path=/head/; revision=134975
Diffstat (limited to 'mail/faces')
-rw-r--r-- | mail/faces/Makefile | 64 | ||||
-rw-r--r-- | mail/faces/files/patch-aa | 36 |
2 files changed, 26 insertions, 74 deletions
diff --git a/mail/faces/Makefile b/mail/faces/Makefile index 06cf76db4de4..41863bca01e6 100644 --- a/mail/faces/Makefile +++ b/mail/faces/Makefile @@ -8,14 +8,20 @@ PORTNAME= faces PORTVERSION= 1.7.7 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= mail MASTER_SITES= ftp://ftp.cs.indiana.edu/pub/faces/faces/ MAINTAINER= ports@FreeBSD.org COMMENT= Visual mail, user and print face server +OPTIONS= X11 "X11/GTK support" on \ + NAS "NAS audio support" off \ + RPLAY "rplay audio support" off \ + SOX "Sox audio support" off + USE_REINPLACE= yes +WANT_GNOME= yes INSTALLS_SHLIB= yes MAN1= compface.1 @@ -23,6 +29,8 @@ MAN3= compface.3 MLINKS= compface.1 uncompface.1 \ compface.3 uncompface.3 +.include <bsd.port.pre.mk> + .if defined(WITHOUT_X11) PLIST_SUB+= X11="@comment " WITH_AUDIO= # none @@ -37,58 +45,38 @@ CONFIGURE_ARGS= --enable-imap --enable-pop \ --enable-name-unknown --with-spooldir=/var/mail \ --with-facedir=${DATADIR} MAN1+= faces.1 -# Audio support is only possible with X11 -.if defined(WITHOUT_AUDIO) -WITH_AUDIO= # none -.else -WITH_AUDIO?= rplay -.endif .endif .if defined(WITHOUT_NLS) CONFIGURE_ARGS+=--disable-nls .endif -.if ${WITH_AUDIO} == "nas" -CONFIGURE_ARGS+= --enable-audio --with-audio-cmd=${X11BASE}/bin/auplay -RUN_DEPENDS= auplay:${PORTSDIR}/audio/nas -.endif -.if ${WITH_AUDIO} == "sox" -CONFIGURE_ARGS+= --enable-audio --with-audio-cmd=${LOCALBASE}/bin/play -RUN_DEPENDS= play:${PORTSDIR}/audio/sox -.endif -.if ${WITH_AUDIO} == "rplay" -CONFIGURE_ARGS+= --enable-audio --with-audio-cmd=${LOCALBASE}/bin/rplay -RUN_DEPENDS= rplay:${PORTSDIR}/audio/rplay +.ifdef WITH_NAS + CONFIGURE_ARGS+= --enable-audio --with-audio-cmd=${X11BASE}/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 -pre-everything:: - @${ECHO_MSG} "" - @${ECHO_MSG} "${PORTNAME} has the following tunables:" - @${ECHO_MSG} "" - @${ECHO_MSG} " WITHOUT_X11=yes build without X11/GTK support" - @${ECHO_MSG} " WITHOUT_AUDIO=yes build without audio support" - @${ECHO_MSG} " WITH_AUDIO=nas build with NAS audio support" - @${ECHO_MSG} " WITH_AUDIO=sox build with SOX audio support" - @${ECHO_MSG} "" - @${ECHO_MSG} "The default is X11/GTK with rplay audio support" - @${ECHO_MSG} "" - # I have no better idea up to now -# Insall the working Makefile for compface from the old faces port +# Install the working Makefile for compface from the old faces port # This was much less complex an builds the shared libs, too post-patch: @${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 -.if ${WITH_AUDIO} == "" - @${REINPLACE_CMD} -e "s%^faces.audioSupport.*%faces.audioSupport: false%" ${WRKSRC}/faces/Faces.ad -.endif -.if ${WITH_AUDIO} == "nas" +.ifdef WITH_NAS @${REINPLACE_CMD} -e "s%rplay%auplay%" ${WRKSRC}/faces/Faces.ad -.endif -.if ${WITH_AUDIO} == "sox" +.elifdef WITH_SOX @${REINPLACE_CMD} -e "s%rplay%play%" ${WRKSRC}/faces/Faces.ad +.elifdef WITH_RPLAY + # nada +.else + @${REINPLACE_CMD} -e "s%^faces.audioSupport.*%faces.audioSupport: false%" ${WRKSRC}/faces/Faces.ad .endif do-build: @@ -122,4 +110,4 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} .endif -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/mail/faces/files/patch-aa b/mail/faces/files/patch-aa deleted file mode 100644 index ac19236ce061..000000000000 --- a/mail/faces/files/patch-aa +++ /dev/null @@ -1,36 +0,0 @@ -*** faces/Makefile.in.orig Tue Apr 9 03:52:16 2002 ---- faces/Makefile.in Tue Jan 21 20:03:50 2003 -*************** -*** 116,122 **** - - bin_PROGRAMS = faces - -! @DNSLOOKUP_TRUE@resolv = -lresolv - faces_LDADD = @GTK_LIBS@ $(INTLLIBS) @X_LIBS@ \ - -lX11 -L../compface -lcompface $(resolv) - ---- 116,122 ---- - - bin_PROGRAMS = faces - -! #@DNSLOOKUP_TRUE@resolv = -lresolv - faces_LDADD = @GTK_LIBS@ $(INTLLIBS) @X_LIBS@ \ - -lX11 -L../compface -lcompface $(resolv) - -*************** -*** 152,158 **** - dialog_warning.xpm - - -! man1_MANS = faces.man - EXTRA_DIST = $(man1_MANS) Faces.ad faces.sendmail - subdir = faces - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ---- 152,158 ---- - dialog_warning.xpm - - -! man1_MANS = faces.1 - EXTRA_DIST = $(man1_MANS) Faces.ad faces.sendmail - subdir = faces - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs |