From 8266578f948d4b02e91751e94158f632f8173866 Mon Sep 17 00:00:00 2001
From: Emanuel Haupt <ehaupt@FreeBSD.org>
Date: Sat, 7 Jun 2014 18:52:53 +0000
Subject: [PATCH] Support staging

---
 misc/iselect/Makefile  | 20 +++++++++-----------
 misc/iselect/pkg-plist | 27 ---------------------------
 2 files changed, 9 insertions(+), 38 deletions(-)
 delete mode 100644 misc/iselect/pkg-plist

diff --git a/misc/iselect/Makefile b/misc/iselect/Makefile
index 98aba6ee9c00..96a30acadf97 100644
--- a/misc/iselect/Makefile
+++ b/misc/iselect/Makefile
@@ -4,24 +4,24 @@
 PORTNAME=	iselect
 PORTVERSION=	1.4.0
 CATEGORIES=	misc
-MASTER_SITES=	${MASTER_SITE_OSSP}
+MASTER_SITES=	OSSP
 MASTER_SITE_SUBDIR=	tool/iselect
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Interactive Selection Tool
 
-OPTIONS_DEFINE=	SLANG
+OPTIONS_DEFINE=	SLANG EXAMPLES
 SLANG_DESC=	Link with slang
 
 GNU_CONFIGURE=	yes
 
-MAN1=		iselect.1
+PLIST_FILES=	bin/iselect man/man1/iselect.1.gz
+PORTEXAMPLES=	*
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MSLANG}
-LIB_DEPENDS+=	slang.2:${PORTSDIR}/devel/libslang2
+LIB_DEPENDS+=	libslang.so:${PORTSDIR}/devel/libslang2
 CONFIGURE_ARGS+=	--with-incdir=${LOCALBASE}/include \
 			--with-libdir=${LOCALBASE}/lib
 .endif
@@ -30,12 +30,10 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|^CFLAGS=|#CFLAGS=|g' ${WRKSRC}/configure
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/iselect ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/iselect.1 ${MANPREFIX}/man/man1
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${EXAMPLESDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/iselect ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/iselect.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC}/example && ${FIND} . | \
-		${CPIO} -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${EXAMPLESDIR}
-.endif
+		${CPIO} -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/misc/iselect/pkg-plist b/misc/iselect/pkg-plist
deleted file mode 100644
index b4b44df5e277..000000000000
--- a/misc/iselect/pkg-plist
+++ /dev/null
@@ -1,27 +0,0 @@
-bin/iselect
-%%PORTDOCS%%%%EXAMPLESDIR%%/README
-%%PORTDOCS%%%%EXAMPLESDIR%%/chdir/README
-%%PORTDOCS%%%%EXAMPLESDIR%%/chdir/dot.bashrc
-%%PORTDOCS%%%%EXAMPLESDIR%%/gotourl/dot.gotourlrc
-%%PORTDOCS%%%%EXAMPLESDIR%%/gotourl/dot.vimrc
-%%PORTDOCS%%%%EXAMPLESDIR%%/gotourl/gotourl
-%%PORTDOCS%%%%EXAMPLESDIR%%/ilogin/README
-%%PORTDOCS%%%%EXAMPLESDIR%%/ilogin/dot.bashrc
-%%PORTDOCS%%%%EXAMPLESDIR%%/ilogin/dot.ilogin
-%%PORTDOCS%%%%EXAMPLESDIR%%/ilogin/ilogin
-%%PORTDOCS%%%%EXAMPLESDIR%%/melm/README
-%%PORTDOCS%%%%EXAMPLESDIR%%/melm/melm
-%%PORTDOCS%%%%EXAMPLESDIR%%/melm/xmelm
-%%PORTDOCS%%%%EXAMPLESDIR%%/mtin/README
-%%PORTDOCS%%%%EXAMPLESDIR%%/mtin/mtin
-%%PORTDOCS%%%%EXAMPLESDIR%%/mtin/xmtin
-%%PORTDOCS%%%%EXAMPLESDIR%%/scvs/README
-%%PORTDOCS%%%%EXAMPLESDIR%%/scvs/dot.scvsrc
-%%PORTDOCS%%%%EXAMPLESDIR%%/scvs/scvs
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/scvs
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/mtin
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/melm
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/ilogin
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/gotourl
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/chdir
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%