From mat@aragorn.in.absolight.net  Tue Oct 22 08:48:18 2013
Return-Path: <mat@aragorn.in.absolight.net>
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by hub.freebsd.org (Postfix) with ESMTP id A25716B2;
	Tue, 22 Oct 2013 08:48:18 +0000 (UTC)
	(envelope-from mat@aragorn.in.absolight.net)
Received: from prod2.absolight.net (mx3.absolight.net [IPv6:2a01:678:2:100::25])
	(using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.freebsd.org (Postfix) with ESMTPS id 33AA628E6;
	Tue, 22 Oct 2013 08:48:17 +0000 (UTC)
Received: from prod2.absolight.net (localhost [127.0.0.1])
	by prod2.absolight.net (Postfix) with ESMTP id D6EABBDC5F;
	Tue, 22 Oct 2013 10:48:15 +0200 (CEST)
Received: from gw.in.absolight.net (gw-ecl.in.absolight.net [79.143.241.69])
	(using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits))
	(Client CN "gw.in.absolight.net", Issuer "CA Cert Signing Authority" (not verified))
	by prod2.absolight.net (Postfix) with ESMTPSA id B355CBDC1D;
	Tue, 22 Oct 2013 10:48:15 +0200 (CEST)
Received: from aragorn.in.absolight.net (aragorn.in.absolight.net [79.143.241.225])
	by gw.in.absolight.net (Postfix) with ESMTP id 1C4E66113;
	Tue, 22 Oct 2013 10:48:15 +0200 (CEST)
Received: by aragorn.in.absolight.net (Postfix, from userid 1000)
	id 7EE8B14269C; Tue, 22 Oct 2013 10:48:14 +0200 (CEST)
Message-Id: <20131022084814.7EE8B14269C@aragorn.in.absolight.net>
Date: Tue, 22 Oct 2013 10:48:14 +0200 (CEST)
From: Mathieu Arnold <mat@FreeBSD.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc: cy@FreeBSD.org
Subject: [PATCH] sysutils/screen: Convert to staging
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         183179
>Category:       ports
>Synopsis:       [PATCH] sysutils/screen: Convert to staging
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Oct 22 08:50:01 UTC 2013
>Closed-Date:    Wed Oct 23 09:34:57 UTC 2013
>Last-Modified:  Wed Oct 23 09:34:57 UTC 2013
>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:
- Convert to staging
- Convert some spaces to 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
@@ -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:
State-Changed-From-To: open->closed 
State-Changed-By: mat 
State-Changed-When: Wed Oct 23 09:34:48 UTC 2013 
State-Changed-Why:  
Dupplicate. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=183179 
>Unformatted:
