svn commit: r349470 - head/x11-wm/ratpoison

[Antoine Brodin]

Author: antoine
Date: Fri Mar 28 22:38:02 2014
New Revision: 349470
URL: http://svnweb.freebsd.org/changeset/ports/349470
QAT: https://qat.redports.org/buildarchive/r349470/

Log:
  - Stage support
  - Remove support for deprecated NOPORTDATA

Modified:
  head/x11-wm/ratpoison/Makefile
  head/x11-wm/ratpoison/pkg-plist

Modified: head/x11-wm/ratpoison/Makefile
==============================================================================
--- head/x11-wm/ratpoison/Makefile	Fri Mar 28 22:24:15 2014	(r349469)
+++ head/x11-wm/ratpoison/Makefile	Fri Mar 28 22:38:02 2014	(r349470)
@@ -17,9 +17,9 @@ GNU_CONFIGURE=	yes
 OPTIONS_DEFINE=	GDM_SUPPORT DOCS
 GDM_SUPPORT_DESC=	Install session data files for GDM
 
+INFO=		ratpoison
 SUB_FILES=	ratpoison.desktop
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 post-patch:
@@ -29,17 +29,10 @@ post-patch:
 PLIST_SUB+=	WITH_GDM=""
 
 post-install:
-	${MKDIR} ${PREFIX}/etc/dm/Sessions
-	${INSTALL_DATA} ${WRKDIR}/ratpoison.desktop ${PREFIX}/etc/dm/Sessions/
+	@${MKDIR} ${PREFIX}/etc/dm/Sessions
+	${INSTALL_DATA} ${WRKDIR}/ratpoison.desktop ${STAGEDIR}${PREFIX}/etc/dm/Sessions
 .else
 PLIST_SUB+=	WITH_GDM="@comment "
 .endif
 
-.if ${PORT_OPTIONS:MDOCS}
-MAN1=		ratpoison.1
-INFO=		ratpoison
-.else
-INSTALL_TARGET=	SUBDIRS=src install-exec
-.endif
-
 .include <bsd.port.mk>

Modified: head/x11-wm/ratpoison/pkg-plist
==============================================================================
--- head/x11-wm/ratpoison/pkg-plist	Fri Mar 28 22:24:15 2014	(r349469)
+++ head/x11-wm/ratpoison/pkg-plist	Fri Mar 28 22:38:02 2014	(r349470)
@@ -1,14 +1,15 @@
 bin/ratpoison
-%%PORTDATA%%bin/rpws
-%%PORTDATA%%%%DATADIR%%/allwindows.sh
-%%PORTDATA%%%%DATADIR%%/clickframe.pl
-%%PORTDATA%%%%DATADIR%%/genrpbindings
-%%PORTDATA%%%%DATADIR%%/ratpoison.el
-%%PORTDATA%%%%DATADIR%%/rpshowall.sh
-%%PORTDATA%%%%DATADIR%%/rpws
-%%PORTDATA%%%%DATADIR%%/split.sh
-%%PORTDATA%%%%DATADIR%%/sloppy.c
-%%PORTDATA%%%%DATADIR%%/unrat.c
+bin/rpws
+man/man1/ratpoison.1.gz
+%%DATADIR%%/allwindows.sh
+%%DATADIR%%/clickframe.pl
+%%DATADIR%%/genrpbindings
+%%DATADIR%%/ratpoison.el
+%%DATADIR%%/rpshowall.sh
+%%DATADIR%%/rpws
+%%DATADIR%%/split.sh
+%%DATADIR%%/sloppy.c
+%%DATADIR%%/unrat.c
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
@@ -16,4 +17,4 @@ bin/ratpoison
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%WITH_GDM%%etc/dm/Sessions/ratpoison.desktop
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%PORTDATA%%@dirrm %%DATADIR%%
+ at dirrm %%DATADIR%%