Attachment 156555 Details for Bug 200069 – EXAPLMES option, Makefile cleanup

[patch] EXAPLMES option, Makefile cleanup

screen.patch (text/plain), 3.81 KB, created by TEUBEL György on 2015-05-09 10:43:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: TEUBEL György

Created: 2015-05-09 10:43:31 UTC

Size: 3.81 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 385876)
>+++ Makefile	(working copy)
>@@ -5,15 +5,13 @@
> PORTVERSION=	4.2.1
> PORTREVISION=	5
> CATEGORIES=	sysutils
>-MASTER_SITES=	http://ftp.gnu.org/gnu/screen/ \
>-		ftp://ftp.gnu.org/gnu/screen/ \
>+MASTER_SITES=	GNU \
> 		ftp://gnu.mirror.iweb.com/screen/ \
> 		http://gnu.mirror.iweb.com/screen/ \
> 		http://mirror.sdunix.com/gnu/ \
> 		ftp://mirrors.kernel.org/gnu/screen/ \
> 		http://komquats.com/distfiles/ \
>-		http://people.freebsd.org/~cy/distfiles/ \
>-		GNU
>+		http://people.freebsd.org/~cy/distfiles/
> 
> MAINTAINER=	cy@FreeBSD.org
> COMMENT=	Multi-screen window manager
>@@ -20,12 +18,19 @@
> 
> LICENSE=	GPLv3
> 
>-OPTIONS_DEFINE=		INFO MAN NETHACK XTERM_256 SHOWENC SYSTEM_SCREENRC
>-OPTIONS_DEFAULT=	INFO MAN NETHACK XTERM_256 SOCKETS SYSTEM_SCREENRC
>+ETCDIR?=	${PREFIX}/etc
>+
>+USES=		gmake cpe
>+CPE_VENDOR=	gnu
>+GNU_CONFIGURE=	yes
>+CONFIGURE_ARGS=	--sysconfdir=${ETCDIR}
>+
>+OPTIONS_DEFINE=		EXAMPLES INFO MANPAGES NETHACK XTERM_256 SHOWENC SYSTEM_SCREENRC
>+OPTIONS_DEFAULT=	INFO MANPAGES NETHACK XTERM_256 SOCKETS SYSTEM_SCREENRC
> 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
>@@ -35,44 +40,20 @@
> 
> OPTIONS_SUB=
> 
>-USES=		gmake cpe
>-
>-CPE_VENDOR=	gnu
>-
>-.include <bsd.port.options.mk>
>-
>-GNU_CONFIGURE=	yes
>-.if ${PORT_OPTIONS:MMAN}
>-MAKE_ARGS+=	WITH_MAN=1
>-PLIST_SUB+=	MAN=""
>-.else
>-PLIST_SUB+=	MAN="@comment"
>-.endif
>-.if ${PORT_OPTIONS:MINFO}
>-.if !exists(/usr/bin/install-info)
>-RUN_DEPENDS+=	install-info:${PORTSDIR}/print/texinfo
>-.endif
>-INFO=		screen
>-MAKE_ARGS+=	WITH_INFO=1
>-.endif
>-
>+INFO_MAKE_ARGS=	WITH_INFO=1
>+INFO_INFO=	screen
>+MANPAGES_MAKE_ARGS=	WITH_MAN=1
>+NETHACK_CFLAGS=	-DNONETHACK
> # Enables support for 256 colour xterm.  Note that you may need to
> # set up a custom termcap entry or .screenrc which modifies termcap
> # to contain the following: Co#256:AB=\E[48;5;%dm:AF=\E[38;5;%dm
> #
>-.if ${PORT_OPTIONS:MXTERM_256}
>-CFLAGS+=	-DCOLORS256
>-.endif
>+XTERM_256_CFLAGS=	-DCOLORS256
>+# show encoding on the status line via option "showenc"
>+SHOWENC_EXTRA_PATCHES=	${FILESDIR}/opt-showencoding
> 
>-.if ! ${PORT_OPTIONS:MNETHACK}
>-CFLAGS+=	-DNONETHACK
>-.endif
>+.include <bsd.port.options.mk>
> 
>-# show encoding on the status line via option "showenc"
>-.if ${PORT_OPTIONS:MSHOWENC}
>-EXTRA_PATCHES+=	${FILESDIR}/opt-showencoding
>-.endif
>-
> post-patch:
> 	@${RM} ${WRKSRC}/doc/screen.info*
> 	@${REINPLACE_CMD} -e 's|/dev/ptmx|/nonexistent|' ${WRKSRC}/configure
>@@ -88,14 +69,14 @@
> 	@${ECHO_CMD} User selected named pipes override set.
> .endif
> 
>-ETCDIR?=	${PREFIX}/etc
>-
> post-install:
>+.if ${PORT_OPTIONS:MEXAMPLES}
> 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
> 	${INSTALL_DATA} ${WRKSRC}/etc/etcscreenrc \
> 		${STAGEDIR}${EXAMPLESDIR}/screenrc.sample-1
> 	${INSTALL_DATA} ${FILESDIR}/screenrc.sample \
> 		${STAGEDIR}${EXAMPLESDIR}/screenrc.sample-2
>+.endif
> 	@${MKDIR} ${STAGEDIR}${ETCDIR}
> .if ${PORT_OPTIONS:MSYSTEM_SCREENRC}
> 	${INSTALL_DATA} ${FILESDIR}/screenrc.sample \
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 385876)
>+++ pkg-plist	(working copy)
>@@ -1,5 +1,5 @@
> bin/screen
>-%%MAN%%man/man1/screen.1.gz
>+%%MANPAGES%%man/man1/screen.1.gz
> %%DATADIR%%/utf8encodings/01
> %%DATADIR%%/utf8encodings/02
> %%DATADIR%%/utf8encodings/03
>@@ -21,5 +21,5 @@
> @comment are installing the the one bundled with source, or the one from
> @comment FILESDIR/screenrc.sample
> @sample %%ETCDIR%%/screenrc.sample
>-%%EXAMPLESDIR%%/screenrc.sample-1
>-%%EXAMPLESDIR%%/screenrc.sample-2
>+%%EXAMPLES%%%%EXAMPLESDIR%%/screenrc.sample-1
>+%%EXAMPLES%%%%EXAMPLESDIR%%/screenrc.sample-2

Actions: View | Diff

Attachments on bug 200069: 156555