Bug 183186

Summary: [PATCH] sysutils/screen: Convert to staging
Product: Ports & Packages Reporter: Mathieu Arnold <mat>
Component: Individual Port(s)Assignee: Cy Schubert <cy>
Status: Closed FIXED    
Severity: Affects Only Me CC: cy
Priority: Normal    
Version: Latest   
Hardware: Any   
OS: Any   
Attachments:
Description Flags
screen-4.0.3_14.patch none

Description Mathieu Arnold freebsd_committer freebsd_triage 2013-10-22 10:30:00 UTC 
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)
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2013-10-22 10:30:08 UTC 
Responsible Changed
From-To: freebsd-ports-bugs->cy

Over to maintainer (via the GNATS Auto Assign Tool)
Comment 2 dfilter service freebsd_committer freebsd_triage 2013-10-22 21:15:24 UTC 
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%%
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 3 Cy Schubert freebsd_committer freebsd_triage 2013-10-22 21:17:55 UTC 
State Changed
From-To: open->closed

Committed. Thanks.