- Stage

- Add missing depends on misc/compat6x due to binary-only distribution
- Fix package installation of default files

2 files changed, 20 insertions, 20 deletions

diff --git a/devel/cscout/Makefile b/devel/cscout/Makefile
index 46117a202dd1..aa173681e269 100644
--- a/devel/cscout/Makefile
+++ b/devel/cscout/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	cscout
 PORTVERSION=	2.7
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://www.spinellis.gr/cscout/ \
 		http://www.dmst.aueb.gr/dds/cscout/
@@ -12,6 +13,8 @@ DISTFILES=	${PORTNAME}-${PORTVERSION}-neutral${EXTRACT_SUFX} \
 MAINTAINER=	dds@FreeBSD.org
 COMMENT=	Source code analyzer and refactoring browser for C program collections
 
+LIB_DEPENDS+=	libc.so.6:${PORTSDIR}/misc/compat6x
+
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 NO_BUILD=	yes
 ONLY_FOR_ARCHS=	i386 amd64 sparc64
@@ -19,9 +22,8 @@ ONLY_FOR_ARCHS_REASON=	The port fetches and installs precompiled binaries
 USES=		perl5
 USE_PERL5=	run
 
-MAN1=	cscout.1 cswc.1
+.include <bsd.port.options.mk>
 
-NO_STAGE=	yes
 post-patch:
 .if exists(/usr/include/g++/)
 	${REINPLACE_CMD} -i "" -e 's:g++-3:g++:g' \
@@ -36,27 +38,21 @@ post-patch:
 	${CP} ${WRKDIR}/cscout_defs.h ${WRKSRC}/etc/cscout_defs.FBSD_GCC
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/cscout ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/bin/cswc ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/bin/csmake ${PREFIX}/bin
-	cd ${WRKSRC}/etc && ${COPYTREE_SHARE} . ${PREFIX}/etc/${PORTNAME}
-# don't overwrite an existing config
-.if !exists(${PREFIX}/etc/${PORTNAME}/cscout_incs.h)
-	${INSTALL_DATA} ${WRKSRC}/etc/cscout_incs.FBSD_GCC ${PREFIX}/etc/${PORTNAME}/cscout_incs.h
-.endif
-.if !exists(${PREFIX}/etc/${PORTNAME}/cscout_defs.h)
-	${INSTALL_DATA} ${WRKDIR}/cscout_defs.h ${PREFIX}/etc/${PORTNAME}/cscout_defs.h
-.endif
-.if !defined(NOPORTEXAMPLES)
-	cd ${WRKSRC}/example && ${COPYTREE_SHARE} . ${EXAMPLESDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/cscout ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/cswc ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/csmake ${STAGEDIR}${PREFIX}/bin
+	cd ${WRKSRC}/etc && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/etc/${PORTNAME}
+	${INSTALL_DATA} ${WRKSRC}/etc/cscout_incs.FBSD_GCC ${STAGEDIR}${PREFIX}/etc/${PORTNAME}/
+	${INSTALL_DATA} ${WRKSRC}/etc/cscout_defs.FBSD_GCC ${STAGEDIR}${PREFIX}/etc/${PORTNAME}/
+.if ${PORT_OPTIONS:MEXAMPLES}
+	cd ${WRKSRC}/example && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
 .endif
-.if !defined(NOPORTDOCS)
-	cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${DOCSDIR}
+.if ${PORT_OPTIONS:MDOCS}
+	cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
 .endif
 .if !defined(NO_INSTALL_MANPAGES)
-.for i in ${MAN1}
-	${INSTALL_MAN} ${WRKSRC}/man/${i} ${PREFIX}/man/man1
-.endfor
+	${INSTALL_MAN} ${WRKSRC}/man/cscout.1 ${STAGEDIR}${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/man/cswc.1 ${STAGEDIR}${PREFIX}/man/man1
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/cscout/pkg-plist b/devel/cscout/pkg-plist
index c52ba118de63..aa7efa89c3f3 100644
--- a/devel/cscout/pkg-plist
+++ b/devel/cscout/pkg-plist
@@ -6,6 +6,7 @@ etc/cscout/acl
 etc/cscout/cscout_defs.BORLAND
 @unexec if cmp -s %D/etc/cscout/cscout_defs.h %D/etc/cscout/cscout_defs.FBSD_GCC ; then rm -f %D/etc/cscout/cscout_defs.h; fi
 etc/cscout/cscout_defs.FBSD_GCC
+@exec [ -f %D/etc/cscout/cscout_defs.h ] || cp %B/%f %B/cscout_defs.h
 etc/cscout/cscout_defs.GENERIC
 etc/cscout/cscout_defs.GENERIC_GCC
 etc/cscout/cscout_defs.LINUX_GCC
@@ -13,10 +14,13 @@ etc/cscout/cscout_defs.WIN32_MINGW
 etc/cscout/cscout_defs.WIN32_MSC
 @unexec if cmp -s %D/etc/cscout/cscout_incs.h %D/etc/cscout/cscout_incs.FBSD_GCC ; then  rm -f %D/etc/cscout/cscout_incs.h; fi
 etc/cscout/cscout_incs.FBSD_GCC
+@exec [ -f %D/etc/cscout/cscout_incs.h ] || cp %B/%f %B/cscout_incs.h
 etc/cscout/cscout_incs.GENERIC
 etc/cscout/cscout_incs.LINUX_GCC
 etc/cscout/cscout_incs.WIN32_MINGW
 etc/cscout/cscout_incs.WIN32_MSC
+man/man1/cscout.1.gz
+man/man1/cswc.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/access.html
 %%PORTDOCS%%%%DOCSDIR%%/awkinc.gif
 %%PORTDOCS%%%%DOCSDIR%%/bib.html