From owner-svn-ports-all@freebsd.org Tue Apr 18 10:33:15 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 46AB7D44DC5; Tue, 18 Apr 2017 10:33:15 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 21539F74; Tue, 18 Apr 2017 10:33:15 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v3IAXEB1039854; Tue, 18 Apr 2017 10:33:14 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v3IAXEvi039852; Tue, 18 Apr 2017 10:33:14 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201704181033.v3IAXEvi039852@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Tue, 18 Apr 2017 10:33:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r438775 - head/devel/omniORB-4.1 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 Apr 2017 10:33:15 -0000 Author: amdmi3 Date: Tue Apr 18 10:33:13 2017 New Revision: 438775 URL: https://svnweb.freebsd.org/changeset/ports/438775 Log: - Fix shebangs - Switch to options helpers - Cosmetic fixes Modified: head/devel/omniORB-4.1/Makefile head/devel/omniORB-4.1/pkg-plist Modified: head/devel/omniORB-4.1/Makefile ============================================================================== --- head/devel/omniORB-4.1/Makefile Tue Apr 18 10:32:51 2017 (r438774) +++ head/devel/omniORB-4.1/Makefile Tue Apr 18 10:33:13 2017 (r438775) @@ -3,7 +3,7 @@ PORTNAME= omniORB PORTVERSION= 4.1.7 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= SF/${PORTNAME:tl}/${PORTNAME}/${PORTNAME}-${PORTVERSION} PKGNAMESUFFIX= 41 @@ -18,7 +18,8 @@ CONFLICTS= omniORB-4.2.* PLIST_SUB+= SONUM=${PORTVERSION:C/.*\.//} GNU_CONFIGURE= yes -USES= gmake pkgconfig python tar:bzip2 ssl +USES= gmake pkgconfig python shebangfix ssl tar:bzip2 +SHEBANG_FILES= src/tool/omniidl/python/scripts/omniidlrun.py USE_LDCONFIG= yes MAKEFILE= GNUmakefile CONFIGURE_ENV+= PYTHON=${PYTHON_CMD} @@ -33,32 +34,30 @@ STATIC_CONFIGURE_OFF= --disable-static BINS= catior convertior genior nameclt omkdepend omniMapper omniNames omnicpp -.include - pre-configure: - ${REINPLACE_CMD} -e 's#-O2#${CFLAGS}#g' ${WRKSRC}/mk/beforeauto.mk.in - ${REINPLACE_CMD} -e 's#%%STAGEDIR%%%%PREFIX%%#${STAGEDIR}${PREFIX}#g' \ + @${REINPLACE_CMD} -e 's#-O2#${CFLAGS}#g' ${WRKSRC}/mk/beforeauto.mk.in + @${REINPLACE_CMD} -e 's#%%STAGEDIR%%%%PREFIX%%#${STAGEDIR}${PREFIX}#g' \ ${WRKSRC}/contrib/pkgconfig/GNUmakefile.in post-install: - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib*.so \ + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib*.so \ ${STAGEDIR}${PYTHON_SITELIBDIR}/_omniidlmodule.so ${PYTHON_CMD} -c "import compileall; compileall.compile_dir('${STAGEDIR}${PYTHON_SITELIBDIR}/omniidl')" ${PYTHON_CMD} -c "import compileall; compileall.compile_dir('${STAGEDIR}${PYTHON_SITELIBDIR}/omniidl_be')" cd ${WRKSRC}/man/man1 && ${INSTALL_MAN} *.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 cd ${WRKSRC}/man/man8 && ${INSTALL_MAN} *.8 ${STAGEDIR}${MAN8PREFIX}/man/man8 .for bin in ${BINS} - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${bin} + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${bin} .endfor -.if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${STAGEDIR}${DOCSDIR} - cd ${WRKSRC} && ${INSTALL_DATA} COPYING README.FIRST.txt README.unix \ - ReleaseNotes.txt ${STAGEDIR}${DOCSDIR} + +post-install-DOCS-on: + @${MKDIR} ${STAGEDIR}${DOCSDIR} + cd ${WRKSRC} && ${INSTALL_DATA} README.FIRST.txt README.unix \ + ReleaseNotes.txt ${STAGEDIR}${DOCSDIR} ${TAR} cCf ${WRKSRC}/doc - . | ${TAR} xUCf ${STAGEDIR}${DOCSDIR} - -.endif -.if ${PORT_OPTIONS:MEXAMPLES} - ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + +post-install-EXAMPLES-on: + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/sample.cfg ${STAGEDIR}${EXAMPLESDIR}/omniORB.cfg -.endif .include Modified: head/devel/omniORB-4.1/pkg-plist ============================================================================== --- head/devel/omniORB-4.1/pkg-plist Tue Apr 18 10:32:51 2017 (r438774) +++ head/devel/omniORB-4.1/pkg-plist Tue Apr 18 10:33:13 2017 (r438775) @@ -344,7 +344,6 @@ man/man1/omnicpp.1.gz man/man1/omniidl.1.gz man/man8/omniMapper.8.gz man/man8/omniNames.8.gz -%%PORTDOCS%%%%DOCSDIR%%/COPYING %%PORTDOCS%%%%DOCSDIR%%/README.FIRST.txt %%PORTDOCS%%%%DOCSDIR%%/README.unix %%PORTDOCS%%%%DOCSDIR%%/ReleaseNotes.txt