Attachment 137577 Details for Bug 183186 – screen-4.0.3_14.patch

[patch] screen-4.0.3_14.patch

screen-4.0.3_14.patch (text/plain), 2.43 KB, created by Mathieu Arnold on 2013-10-22 10:30:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mathieu Arnold

Created: 2013-10-22 10:30:00 UTC

Size: 2.43 KB

patch

obsolete

>diff -ruN /usr/ports/sysutils/screen/Makefile ./Makefile
>--- /usr/ports/sysutils/screen/Makefile	2013-09-21 01:05:58.000000000 +0200
>+++ ./Makefile	2013-10-22 10:45:52.000000000 +0200
>@@ -1,5 +1,5 @@
> # Created by: ache
>-# $FreeBSD: sysutils/screen/Makefile 327772 2013-09-20 23:05:58Z bapt $
>+# $FreeBSD: head/sysutils/screen/Makefile 327772 2013-09-20 23:05:58Z bapt $
> 
> PORTNAME=	screen
> PORTVERSION=	4.0.3
>@@ -24,12 +24,12 @@
> HOSTINLOCKED_DESC=	Print user@host in locked message
> SHOWENC_DESC=		Show encoding on the status line
> 
>-NO_STAGE=	yes
>+OPTIONS_SUB=
>+
> .include <bsd.port.options.mk>
> 
> GNU_CONFIGURE=	yes
> .if ${PORT_OPTIONS:MMAN}
>-MAN1=		screen.1
> MAKE_ARGS+=	-DWITH_MAN
> .endif
> .if ${PORT_OPTIONS:MINFO}
>@@ -62,7 +62,7 @@
> .endif
> 
> .if ${PORT_OPTIONS:MHOSTINLOCKED}
>-EXTRA_PATCHES+= ${FILESDIR}/opt-hostinlocked
>+EXTRA_PATCHES+=	${FILESDIR}/opt-hostinlocked
> .endif
> 
> # show encoding on the status line via option "showenc"
>@@ -75,10 +75,7 @@
> 	@${REINPLACE_CMD} -e 's|/dev/ptmx|/nonexistent|' ${WRKSRC}/configure
> 
> post-install:
>-	@${MKDIR} ${EXAMPLESDIR}
>-	@${CP} ${WRKSRC}/etc/etcscreenrc ${EXAMPLESDIR}/screenrc
>-	@if [ ! -f ${PREFIX}/etc/screenrc ]; then \
>-		${CP} ${EXAMPLESDIR}/screenrc ${PREFIX}/etc/screenrc ; \
>-	fi
>+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
>+	@${INSTALL_DATA} ${WRKSRC}/etc/etcscreenrc ${STAGEDIR}${EXAMPLESDIR}/screenrc
> 
> .include <bsd.port.mk>
>diff -ruN /usr/ports/sysutils/screen/pkg-plist ./pkg-plist
>--- /usr/ports/sysutils/screen/pkg-plist	2012-07-14 16:29:18.000000000 +0200
>+++ ./pkg-plist	2013-10-22 10:27:45.000000000 +0200
>@@ -1,4 +1,8 @@
> bin/screen
>+%%MAN%%man/man1/screen.1.gz
>+@unexec if cmp -s %D/etc/screenrc %D/%%EXAMPLESDIR%%/screenrc; then rm -f %D/etc/screenrc; else echo If permanently deleting this package, %%PREFIX%%/etc/screenrc must be removed manually; fi
>+%%EXAMPLESDIR%%/screenrc
>+@exec [ -f %D/etc/screenrc ] || cp %B/%f %D/etc/screenrc
> %%DATADIR%%/utf8encodings/01
> %%DATADIR%%/utf8encodings/02
> %%DATADIR%%/utf8encodings/03
>@@ -16,9 +20,6 @@
> %%DATADIR%%/utf8encodings/cc
> %%DATADIR%%/utf8encodings/cd
> %%DATADIR%%/utf8encodings/d6
>-@unexec if cmp -s %D/etc/screenrc %D/%%EXAMPLESDIR%%/screenrc; then rm -f %D/etc/screenrc; else echo If permanently deleting this package, %%PREFIX%%/etc/screenrc must be removed manually; fi
>-%%EXAMPLESDIR%%/screenrc
>-@exec [ -f %D/etc/screenrc ] || cp %B/%f %D/etc/screenrc
>-@dirrm %%EXAMPLESDIR%%
> @dirrm %%DATADIR%%/utf8encodings
> @dirrm %%DATADIR%%
>+@dirrm %%EXAMPLESDIR%%

Actions: View | Diff

Attachments on bug 183186: 137577