From owner-svn-ports-all@FreeBSD.ORG  Tue Oct 22 20:15:17 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
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 93C3FC2A;
 Tue, 22 Oct 2013 20:15:17 +0000 (UTC) (envelope-from cy@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 6921824F1;
 Tue, 22 Oct 2013 20:15:17 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9MKFHWJ027344;
 Tue, 22 Oct 2013 20:15:17 GMT (envelope-from cy@svn.freebsd.org)
Received: (from cy@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9MKFHrh027342;
 Tue, 22 Oct 2013 20:15:17 GMT (envelope-from cy@svn.freebsd.org)
Message-Id: <201310222015.r9MKFHrh027342@svn.freebsd.org>
From: Cy Schubert <cy@FreeBSD.org>
Date: Tue, 22 Oct 2013 20:15:17 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r331314 - head/sysutils/screen
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 22 Oct 2013 20:15:17 -0000

Author: cy
Date: Tue Oct 22 20:15:16 2013
New Revision: 331314
URL: http://svnweb.freebsd.org/changeset/ports/331314

Log:
  Convert to staging.
  
  PR:		183186
  Submitted by:	mat

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

Modified: head/sysutils/screen/Makefile
==============================================================================
--- head/sysutils/screen/Makefile	Tue Oct 22 20:11:41 2013	(r331313)
+++ head/sysutils/screen/Makefile	Tue Oct 22 20:15:16 2013	(r331314)
@@ -24,12 +24,12 @@ XTERM_256_DESC=		Enable support for 256 
 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}
@@ -75,10 +75,8 @@ post-patch:
 	@${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>

Modified: head/sysutils/screen/pkg-plist
==============================================================================
--- head/sysutils/screen/pkg-plist	Tue Oct 22 20:11:41 2013	(r331313)
+++ head/sysutils/screen/pkg-plist	Tue Oct 22 20:15:16 2013	(r331314)
@@ -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 @@ bin/screen
 %%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%%