- Add staging support

- Convert to new options framework
- Use DATADIR, DOCSDIR to make things simplier

2 files changed, 113 insertions, 120 deletions

diff --git a/lang/intel2gas/Makefile b/lang/intel2gas/Makefile
index d7e9a1867ae0..fb2e07e1fad3 100644
--- a/lang/intel2gas/Makefile
+++ b/lang/intel2gas/Makefile
@@ -12,21 +12,14 @@ COMMENT=	Converts Intel assembly language (nasm) to AT&T syntax (gas)
 GNU_CONFIGURE=	yes
 MAKE_ARGS=	CXX="${CXX}"
 
-DATAPREFIX=	${PREFIX}/share/intel2gas
-DATADIRS=	i2g g2i m2g
-DOCS=		BUGS DATAFILES README
+OPTIONS_DEFINE=	DOCS
 
-NO_STAGE=	yes
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/intel2gas ${PREFIX}/bin
-	${MKDIR} ${DATAPREFIX}
-.for dir in ${DATADIRS}
-	${MKDIR} ${DATAPREFIX}/${dir}
-	cd ${WRKSRC}; ${INSTALL_DATA} ${dir}/* ${DATAPREFIX}/${dir}
-.endfor
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/intel2gas
-	cd ${WRKSRC}; ${INSTALL_DATA} ${DOCS} ${PREFIX}/share/doc/intel2gas
-.endif
+	${INSTALL_PROGRAM} ${WRKSRC}/intel2gas ${STAGEDIR}${PREFIX}/bin
+	@${MKDIR} ${STAGEDIR}${DATADIR}
+	(cd ${WRKSRC} && ${COPYTREE_SHARE} "i2g g2i m2g" ${STAGEDIR}${DATADIR})
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKSRC}; ${INSTALL_DATA} BUGS DATAFILES README \
+		${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
diff --git a/lang/intel2gas/pkg-plist b/lang/intel2gas/pkg-plist
index 80867ccee1f0..34d9ecb2185b 100644
--- a/lang/intel2gas/pkg-plist
+++ b/lang/intel2gas/pkg-plist
@@ -1,107 +1,107 @@
 bin/intel2gas
-%%PORTDOCS%%share/doc/intel2gas/BUGS
-%%PORTDOCS%%share/doc/intel2gas/DATAFILES
-%%PORTDOCS%%share/doc/intel2gas/README
-share/intel2gas/g2i/+-.01.list
-share/intel2gas/g2i/+-.02.list
-share/intel2gas/g2i/addr.syntax
-share/intel2gas/g2i/address.syntax
-share/intel2gas/g2i/data.01.list
-share/intel2gas/g2i/data.02.list
-share/intel2gas/g2i/data.04.list
-share/intel2gas/g2i/fpureg.syntax
-share/intel2gas/g2i/jump.syntax
-share/intel2gas/g2i/jumpaddr.syntax
-share/intel2gas/g2i/main.syntax
-share/intel2gas/g2i/mathnum.syntax
-share/intel2gas/g2i/num.syntax
-share/intel2gas/g2i/numlist.syntax
-share/intel2gas/g2i/op.01.list
-share/intel2gas/g2i/op.02.list
-share/intel2gas/g2i/op.04.list
-share/intel2gas/g2i/op.08.list
-share/intel2gas/g2i/op.10.list
-share/intel2gas/g2i/op.20.list
-share/intel2gas/g2i/reg.01.list
-share/intel2gas/g2i/reg.02.list
-share/intel2gas/g2i/reg.04.list
-share/intel2gas/g2i/reg.08.list
-share/intel2gas/g2i/reg.10.list
-share/intel2gas/g2i/section.01.list
-share/intel2gas/g2i/size.01.list
-share/intel2gas/g2i/size.02.list
-share/intel2gas/g2i/size.04.list
-share/intel2gas/g2i/size.08.list
-share/intel2gas/g2i/size.10.list
-share/intel2gas/g2i/strings.syntax
-share/intel2gas/g2i/textlist.syntax
-share/intel2gas/i2g/+-.01.list
-share/intel2gas/i2g/+-.02.list
-share/intel2gas/i2g/address.syntax
-share/intel2gas/i2g/data.01.list
-share/intel2gas/i2g/data.02.list
-share/intel2gas/i2g/data.04.list
-share/intel2gas/i2g/data.08.list
-share/intel2gas/i2g/discard.01.list
-share/intel2gas/i2g/fpureg.syntax
-share/intel2gas/i2g/jump.syntax
-share/intel2gas/i2g/main.syntax
-share/intel2gas/i2g/mathnum.syntax
-share/intel2gas/i2g/num.syntax
-share/intel2gas/i2g/numlist.syntax
-share/intel2gas/i2g/op.01.list
-share/intel2gas/i2g/op.02.list
-share/intel2gas/i2g/op.04.list
-share/intel2gas/i2g/op.08.list
-share/intel2gas/i2g/op.10.list
-share/intel2gas/i2g/op.20.list
-share/intel2gas/i2g/reg.01.list
-share/intel2gas/i2g/reg.02.list
-share/intel2gas/i2g/reg.04.list
-share/intel2gas/i2g/reg.08.list
-share/intel2gas/i2g/reg.10.list
-share/intel2gas/i2g/section.01.list
-share/intel2gas/i2g/size.01.list
-share/intel2gas/i2g/size.02.list
-share/intel2gas/i2g/size.04.list
-share/intel2gas/i2g/size.08.list
-share/intel2gas/i2g/size.10.list
-share/intel2gas/i2g/textlist.syntax
-share/intel2gas/m2g/+-.01.list
-share/intel2gas/m2g/+-.02.list
-share/intel2gas/m2g/address.syntax
-share/intel2gas/m2g/data.01.list
-share/intel2gas/m2g/data.02.list
-share/intel2gas/m2g/data.04.list
-share/intel2gas/m2g/data.08.list
-share/intel2gas/m2g/discard.01.list
-share/intel2gas/m2g/fpureg.syntax
-share/intel2gas/m2g/jump.syntax
-share/intel2gas/m2g/main.syntax
-share/intel2gas/m2g/manypublics.syntax
-share/intel2gas/m2g/mathnum.syntax
-share/intel2gas/m2g/num.syntax
-share/intel2gas/m2g/numlist.syntax
-share/intel2gas/m2g/op.01.list
-share/intel2gas/m2g/op.02.list
-share/intel2gas/m2g/op.04.list
-share/intel2gas/m2g/op.08.list
-share/intel2gas/m2g/op.10.list
-share/intel2gas/m2g/op.20.list
-share/intel2gas/m2g/reg.01.list
-share/intel2gas/m2g/reg.02.list
-share/intel2gas/m2g/reg.04.list
-share/intel2gas/m2g/reg.08.list
-share/intel2gas/m2g/reg.10.list
-share/intel2gas/m2g/section.01.list
-share/intel2gas/m2g/size.01.list
-share/intel2gas/m2g/size.02.list
-share/intel2gas/m2g/size.04.list
-share/intel2gas/m2g/size.08.list
-share/intel2gas/m2g/size.10.list
-share/intel2gas/m2g/textlist.syntax
-@dirrm share/intel2gas/m2g
-@dirrm share/intel2gas/i2g
-@dirrm share/intel2gas/g2i
-@dirrm share/intel2gas
-%%PORTDOCS%%@dirrm share/doc/intel2gas
+%%PORTDOCS%%%%DOCSDIR%%/BUGS
+%%PORTDOCS%%%%DOCSDIR%%/DATAFILES
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%DATADIR%%/g2i/+-.01.list
+%%DATADIR%%/g2i/+-.02.list
+%%DATADIR%%/g2i/addr.syntax
+%%DATADIR%%/g2i/address.syntax
+%%DATADIR%%/g2i/data.01.list
+%%DATADIR%%/g2i/data.02.list
+%%DATADIR%%/g2i/data.04.list
+%%DATADIR%%/g2i/fpureg.syntax
+%%DATADIR%%/g2i/jump.syntax
+%%DATADIR%%/g2i/jumpaddr.syntax
+%%DATADIR%%/g2i/main.syntax
+%%DATADIR%%/g2i/mathnum.syntax
+%%DATADIR%%/g2i/num.syntax
+%%DATADIR%%/g2i/numlist.syntax
+%%DATADIR%%/g2i/op.01.list
+%%DATADIR%%/g2i/op.02.list
+%%DATADIR%%/g2i/op.04.list
+%%DATADIR%%/g2i/op.08.list
+%%DATADIR%%/g2i/op.10.list
+%%DATADIR%%/g2i/op.20.list
+%%DATADIR%%/g2i/reg.01.list
+%%DATADIR%%/g2i/reg.02.list
+%%DATADIR%%/g2i/reg.04.list
+%%DATADIR%%/g2i/reg.08.list
+%%DATADIR%%/g2i/reg.10.list
+%%DATADIR%%/g2i/section.01.list
+%%DATADIR%%/g2i/size.01.list
+%%DATADIR%%/g2i/size.02.list
+%%DATADIR%%/g2i/size.04.list
+%%DATADIR%%/g2i/size.08.list
+%%DATADIR%%/g2i/size.10.list
+%%DATADIR%%/g2i/strings.syntax
+%%DATADIR%%/g2i/textlist.syntax
+%%DATADIR%%/i2g/+-.01.list
+%%DATADIR%%/i2g/+-.02.list
+%%DATADIR%%/i2g/address.syntax
+%%DATADIR%%/i2g/data.01.list
+%%DATADIR%%/i2g/data.02.list
+%%DATADIR%%/i2g/data.04.list
+%%DATADIR%%/i2g/data.08.list
+%%DATADIR%%/i2g/discard.01.list
+%%DATADIR%%/i2g/fpureg.syntax
+%%DATADIR%%/i2g/jump.syntax
+%%DATADIR%%/i2g/main.syntax
+%%DATADIR%%/i2g/mathnum.syntax
+%%DATADIR%%/i2g/num.syntax
+%%DATADIR%%/i2g/numlist.syntax
+%%DATADIR%%/i2g/op.01.list
+%%DATADIR%%/i2g/op.02.list
+%%DATADIR%%/i2g/op.04.list
+%%DATADIR%%/i2g/op.08.list
+%%DATADIR%%/i2g/op.10.list
+%%DATADIR%%/i2g/op.20.list
+%%DATADIR%%/i2g/reg.01.list
+%%DATADIR%%/i2g/reg.02.list
+%%DATADIR%%/i2g/reg.04.list
+%%DATADIR%%/i2g/reg.08.list
+%%DATADIR%%/i2g/reg.10.list
+%%DATADIR%%/i2g/section.01.list
+%%DATADIR%%/i2g/size.01.list
+%%DATADIR%%/i2g/size.02.list
+%%DATADIR%%/i2g/size.04.list
+%%DATADIR%%/i2g/size.08.list
+%%DATADIR%%/i2g/size.10.list
+%%DATADIR%%/i2g/textlist.syntax
+%%DATADIR%%/m2g/+-.01.list
+%%DATADIR%%/m2g/+-.02.list
+%%DATADIR%%/m2g/address.syntax
+%%DATADIR%%/m2g/data.01.list
+%%DATADIR%%/m2g/data.02.list
+%%DATADIR%%/m2g/data.04.list
+%%DATADIR%%/m2g/data.08.list
+%%DATADIR%%/m2g/discard.01.list
+%%DATADIR%%/m2g/fpureg.syntax
+%%DATADIR%%/m2g/jump.syntax
+%%DATADIR%%/m2g/main.syntax
+%%DATADIR%%/m2g/manypublics.syntax
+%%DATADIR%%/m2g/mathnum.syntax
+%%DATADIR%%/m2g/num.syntax
+%%DATADIR%%/m2g/numlist.syntax
+%%DATADIR%%/m2g/op.01.list
+%%DATADIR%%/m2g/op.02.list
+%%DATADIR%%/m2g/op.04.list
+%%DATADIR%%/m2g/op.08.list
+%%DATADIR%%/m2g/op.10.list
+%%DATADIR%%/m2g/op.20.list
+%%DATADIR%%/m2g/reg.01.list
+%%DATADIR%%/m2g/reg.02.list
+%%DATADIR%%/m2g/reg.04.list
+%%DATADIR%%/m2g/reg.08.list
+%%DATADIR%%/m2g/reg.10.list
+%%DATADIR%%/m2g/section.01.list
+%%DATADIR%%/m2g/size.01.list
+%%DATADIR%%/m2g/size.02.list
+%%DATADIR%%/m2g/size.04.list
+%%DATADIR%%/m2g/size.08.list
+%%DATADIR%%/m2g/size.10.list
+%%DATADIR%%/m2g/textlist.syntax
+@dirrm %%DATADIR%%/m2g
+@dirrm %%DATADIR%%/i2g
+@dirrm %%DATADIR%%/g2i
+@dirrm %%DATADIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%