svn commit: r357827 - head/sysutils/screen

[Cy Schubert]

Author: cy
Date: Sun Jun 15 05:44:44 2014
New Revision: 357827
URL: http://svnweb.freebsd.org/changeset/ports/357827
QAT: https://qat.redports.org/buildarchive/r357827/

Log:
  Due to popular demand sockets are back! Sockets are the default option.
  Users should choose named pipes in a heterogeneous environement that uses
  both screen 4.0.3 and 4.2.1.
  
  PR:		191029, 191017

Modified:
  head/sysutils/screen/Makefile

Modified: head/sysutils/screen/Makefile
==============================================================================
--- head/sysutils/screen/Makefile	Sun Jun 15 04:35:49 2014	(r357826)
+++ head/sysutils/screen/Makefile	Sun Jun 15 05:44:44 2014	(r357827)
@@ -20,13 +20,17 @@ COMMENT=	Multi-screen window manager
 
 LICENSE=	GPLv3
 
-OPTIONS_DEFINE=	INFO MAN NETHACK XTERM_256 SHOWENC
-OPTIONS_DEFAULT=	INFO MAN NETHACK XTERM_256
+OPTIONS_DEFINE=		INFO MAN NETHACK XTERM_256 SHOWENC
+OPTIONS_DEFAULT=	INFO MAN NETHACK XTERM_256 SOCKETS
+OPTIONS_SINGLE=		IPC
+OPTIONS_SINGLE_IPC=	SOCKETS NAMED_PIPES
 INFO_DESC=		Build and install info documentation
 MAN_DESC=		Build and install man pages
 NETHACK_DESC=		Enable nethack-style messages
 XTERM_256_DESC=		Enable support for 256 colour xterm
 SHOWENC_DESC=		Show encoding on the status line
+SOCKETS_DESC=		Use new (4.2.1+) sockets for IPC (default)
+NAMED_PIPES_DESC=	Use legacy (4.0.3) named pipes for IPC (override)
 
 OPTIONS_SUB=
 
@@ -70,9 +74,16 @@ post-patch:
 	@${RM} ${WRKSRC}/doc/screen.info*
 	@${REINPLACE_CMD} -e 's|/dev/ptmx|/nonexistent|' ${WRKSRC}/configure
 
+# Bug 191029:	Users can choose whether to use sockets or named pipes.
+# 		Choose sockets if you don't know what the difference is.
+# 		Choose named pipes if your environment is heterogeneous,
+#		using both screen 4.0.3 and 4.2.1.
+.if ! ${PORT_OPTIONS:MNAMED_PIPES}
 # Bug 191017
 post-configure:
 	@${ECHO_CMD} '#define NAMEDPIPE 1' >> ${WRKSRC}/config.h
+	@${ECHO_CMD} User selected named pipes override set.
+.endif
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}