diff options
author | Michael Gmelin <grembo@FreeBSD.org> | 2015-07-13 19:48:31 +0000 |
---|---|---|
committer | Michael Gmelin <grembo@FreeBSD.org> | 2015-07-13 19:48:31 +0000 |
commit | 4aff7c172aea9ed50e57dd8d72b07f14e933eea3 (patch) | |
tree | 44b0b251b0efbeb4b43e52a52af7aaa13732a930 /devel/ice/Makefile | |
parent | e4190a6e76e13bdc52d7e63cbf4173d8b7aef278 (diff) | |
download | ports-4aff7c172aea9ed50e57dd8d72b07f14e933eea3.tar.gz ports-4aff7c172aea9ed50e57dd8d72b07f14e933eea3.zip |
Update devel/ice, devel/py-ice and devel/php5-ice to 3.6.0
PR: 201143
Differential Revision: https://reviews.freebsd.org/D2930
Reviewed by: bapt
Approved by: bapt
Tested by: Roger Leigh <rleigh@codelibre.net>
Notes
Notes:
svn path=/head/; revision=391942
Diffstat (limited to 'devel/ice/Makefile')
-rw-r--r-- | devel/ice/Makefile | 54 |
1 files changed, 29 insertions, 25 deletions
diff --git a/devel/ice/Makefile b/devel/ice/Makefile index d8a3a6d5f93f..f84d2197675b 100644 --- a/devel/ice/Makefile +++ b/devel/ice/Makefile @@ -2,10 +2,8 @@ # $FreeBSD$ PORTNAME= Ice -PORTVERSION= 3.5.1 -PORTREVISION= 7 +PORTVERSION= 3.6.0 CATEGORIES= devel -MASTER_SITES= http://download.zeroc.com/Ice/3.5/ MAINTAINER= freebsd@grem.de COMMENT= Modern alternative to object middleware such as CORBA/COM/DCOM/COM+ @@ -24,10 +22,9 @@ LIB_DEPENDS+= libIce.so.${LIB_VRS}:${PORTSDIR}/devel/ice PLIST_SUB+= LIB_VERSION="${PORTVERSION}" LIB_VRS="${LIB_VRS}" .endif -OPTIONS_DEFINE?= DEBUG DEMOS DOCS TESTS -OPTIONS_DEFAULT?= DEMOS TESTS +OPTIONS_DEFINE?= DEBUG TESTS +OPTIONS_DEFAULT?= TESTS TESTS_DESC?= Build and run tests (requires lang/python) -DEMOS_DESC?= Build demos .include <bsd.port.options.mk> @@ -35,29 +32,30 @@ USES+= iconv gmake .if ${PORT_OPTIONS:MTESTS} && ${SLAVE_PORT} == "no" USES+= python:build +BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}passlib>0:${PORTSDIR}/security/py-passlib .endif +WRKSRC= ${WRKDIR}/ice-${PORTVERSION} + USE_BDB= yes WANT_BDB_VER= 5 INVALID_BDB_VER= 40 41 42 43 44 46 47 48 6 USE_LDCONFIG= yes BUILD_WRKSRC?= ${WRKSRC}/cpp INSTALL_WRKSRC?= ${WRKSRC}/cpp +USE_GITHUB= yes +GH_ACCOUNT= zeroc-ice +GH_TAGNAME= v3.6.0 + CFLAGS+= -ftemplate-depth-128 -fPIC -DPIC -Wall -D_REENTRANT -I${LOCALBASE}/include -.if ${PORT_OPTIONS:MDEBUG} -CFLAGS+= -g -.else -CFLAGS+= -DNDEBUG -.endif -.if ${ARCH} == "ia64" -BROKEN= does not compile on ia64 +.if !${PORT_OPTIONS:MDEBUG} +CFLAGS+= -DNDEBUG .endif -.if ${ARCH} == "sparc64" -BROKEN= fails to link -.endif +BROKEN_ia64= Does not compile on ${ARCH} +BROKEN_sparc64= Does not compile on ${ARCH} .if ((${ARCH} != i386) && (${ARCH} != powerpc)) MAKE_ENV+= LP64=yes @@ -67,12 +65,8 @@ MAKE_ENV+= LP64=yes MAKE_ENV+= NOTESTS=yes .endif -.if !${PORT_OPTIONS:MDEMOS} -MAKE_ENV+= NODEMOS=yes -.endif - -.if !${PORT_OPTIONS:MDOCS} -MAKE_ENV+= NOICEDOCS=yes +.if ${SLAVE_PORT} == "no" +MAKE_ENV+= LD_LIBRARY_PATH=${WRKSRC}/cpp/lib:$$LD_LIBRARY_PATH .endif .include <bsd.port.pre.mk> @@ -117,21 +111,26 @@ post-patch: ${WRKSRC}/cpp/config/Make.rules @${REINPLACE_CMD} '/install_configdir/d' \ ${WRKSRC}/cpp/config/Make.rules - @${REINPLACE_CMD} 's|INSTALL_PROGRAM|INSTALL_DATA|g' \ - ${WRKSRC}/cpp/src/ca/Makefile @${REINPLACE_CMD} '/LICENSE/s/prefix/install_slicedir/; \ s|%%INSTALL_PROGRAM%%|${INSTALL_PROGRAM}|g; ' \ ${WRKSRC}/config/Make.common.rules @${REINPLACE_CMD} 's|%%INSTALL_PROGRAM%%|${INSTALL_PROGRAM}|g; \ s|%%INSTALL_DATA%%|${INSTALL_DATA}|g; \ s|%%ICONV_LIB%%|${ICONV_LIB}|g; \ + s|%%PYTHON_CMD%%|${PYTHON_CMD}|g; \ s|%%PYTHON_SITELIBDIR%%|${STAGEDIR}${PYSITEDIR}|g; \ s|%%PREFIX%%|${PREFIX}|g ; \ - s|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/py/config/Make.rules + s|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/python/config/Make.rules @${REINPLACE_CMD} 's|%%INSTALL_PROGRAM%%|${INSTALL_PROGRAM}|g; \ s|%%INSTALL_DATA%%|${INSTALL_DATA}|g; \ s|%%PREFIX%%|${PREFIX}|g ; \ s|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/php/config/Make.rules.php +.if empty(ICONV_LIB) + # native iconv detected + @${REINPLACE_CMD} \ + -e 's|<iconv.h>|</usr/include/iconv.h>|g;' \ + ${WRKSRC}/cpp/include/IceUtil/IconvStringConverter.h +.endif .if ${PORT_OPTIONS:MTESTS} TEST_CMD= @cd ${BUILD_WRKSRC} && ${PYTHON_CMD} ./allTests.py @@ -141,4 +140,9 @@ check regression-test test: build pre-install: regression-test .endif +.if ${SLAVE_PORT} == "no" +post-install: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so.* +.endif + .include <bsd.port.post.mk> |