Date: Tue, 22 Oct 2013 11:28:40 +0200 (CEST) From: Mathieu Arnold <mat@FreeBSD.org> To: FreeBSD-gnats-submit@freebsd.org Cc: cy@FreeBSD.org Subject: ports/183186: [PATCH] sysutils/screen: Convert to staging Message-ID: <20131022092841.0C72F14269C@aragorn.in.absolight.net> Resent-Message-ID: <201310220930.r9M9U06B044872@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 183186
>Category: ports
>Synopsis: [PATCH] sysutils/screen: Convert to staging
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Tue Oct 22 09:30:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: Mathieu Arnold
>Release: FreeBSD 9.2-RELEASE i386
>Organization:
Absolight
>Environment:
System: FreeBSD aragorn.in.absolight.net 9.2-RELEASE FreeBSD 9.2-RELEASE #0 r255898: Fri Sep 27 03:52:52 UTC
>Description:
Second try at sending it, gnats eat the first one...
- Convert to staging
- Replace some spaces with tabs to shut portlint up
- Reorder plist a bit
Port maintainer (cy@FreeBSD.org) is cc'd.
Generated with FreeBSD Port Tools 0.99_8 (mode: change, diff: ports)
>How-To-Repeat:
>Fix:
--- screen-4.0.3_14.patch begins here ---
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%%
--- screen-4.0.3_14.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20131022092841.0C72F14269C>