Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 29 Aug 2019 14:09:55 +0000 (UTC)
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r510164 - head/sysutils/screen
Message-ID:  <201908291409.x7TE9tZM000235@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bapt
Date: Thu Aug 29 14:09:54 2019
New Revision: 510164
URL: https://svnweb.freebsd.org/changeset/ports/510164

Log:
  Always install the manpage and let the user decide if they do want
  to install groff(1) as advised by man(1) if they want.
  
  Reviewed by:	cy
  Approved by:	cy (maintainer)
  Differential Revision:	https://reviews.freebsd.org/D21463

Modified:
  head/sysutils/screen/Makefile
  head/sysutils/screen/pkg-plist

Modified: head/sysutils/screen/Makefile
==============================================================================
--- head/sysutils/screen/Makefile	Thu Aug 29 13:44:16 2019	(r510163)
+++ head/sysutils/screen/Makefile	Thu Aug 29 14:09:54 2019	(r510164)
@@ -3,7 +3,7 @@
 
 PORTNAME=	screen
 PORTVERSION=	4.6.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils
 MASTER_SITES=	GNU \
 		ftp://ftp.gnu.org/gnu/screen/ \
@@ -19,14 +19,13 @@ COMMENT=	Multi-screen window manager
 
 LICENSE=	GPLv3
 
-OPTIONS_DEFINE=		INFO MAN NETHACK XTERM_256 SHOWENC SYSTEM_SCREENRC
+OPTIONS_DEFINE=		INFO NETHACK XTERM_256 SHOWENC SYSTEM_SCREENRC
 OPTIONS_DEFAULT=	INFO NETHACK XTERM_256 SOCKETS SYSTEM_SCREENRC \
 			NCURSES_DEFAULT
 OPTIONS_SINGLE=		IPC NCURSES
 OPTIONS_SINGLE_IPC=	SOCKETS NAMED_PIPES
 OPTIONS_SINGLE_NCURSES=	NCURSES_DEFAULT NCURSES_BASE NCURSES_PORT
 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
@@ -44,6 +43,7 @@ NCURSES_PORT_USES=	ncurses:port
 OPTIONS_SUB=
 
 USES=		gmake cpe
+MAKE_ARGS+=	WITH_MAN=1
 
 CPE_VENDOR=	gnu
 
@@ -53,13 +53,6 @@ GNU_CONFIGURE=	yes
 CFLAGS+=	-I${NCURSESINC}
 LDFLAGS+=	-L${NCURSESLIB}
 
-.if ${PORT_OPTIONS:MMAN}
-MAKE_ARGS+=	WITH_MAN=1
-PLIST_SUB+=	MAN=""
-USES+=		groff
-.else
-PLIST_SUB+=	MAN="@comment"
-.endif
 .if ${PORT_OPTIONS:MINFO}
 INFO=		screen
 MAKE_ARGS+=	WITH_INFO=1

Modified: head/sysutils/screen/pkg-plist
==============================================================================
--- head/sysutils/screen/pkg-plist	Thu Aug 29 13:44:16 2019	(r510163)
+++ head/sysutils/screen/pkg-plist	Thu Aug 29 14:09:54 2019	(r510164)
@@ -1,5 +1,5 @@
 bin/screen
-%%MAN%%man/man1/screen.1.gz
+man/man1/screen.1.gz
 %%DATADIR%%/utf8encodings/01
 %%DATADIR%%/utf8encodings/02
 %%DATADIR%%/utf8encodings/03



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201908291409.x7TE9tZM000235>