Date: Fri, 11 Apr 2014 01:01:31 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r350867 - head/devel/cscout Message-ID: <201404110101.s3B11VOl038483@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Fri Apr 11 01:01:30 2014 New Revision: 350867 URL: http://svnweb.freebsd.org/changeset/ports/350867 QAT: https://qat.redports.org/buildarchive/r350867/ Log: - Stage - Add missing depends on misc/compat6x due to binary-only distribution - Fix package installation of default files Modified: head/devel/cscout/Makefile head/devel/cscout/pkg-plist Modified: head/devel/cscout/Makefile ============================================================================== --- head/devel/cscout/Makefile Fri Apr 11 00:51:02 2014 (r350866) +++ head/devel/cscout/Makefile Fri Apr 11 01:01:30 2014 (r350867) @@ -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}-ne 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 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> Modified: head/devel/cscout/pkg-plist ============================================================================== --- head/devel/cscout/pkg-plist Fri Apr 11 00:51:02 2014 (r350866) +++ head/devel/cscout/pkg-plist Fri Apr 11 01:01:30 2014 (r350867) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404110101.s3B11VOl038483>