Index: head/devel/ccache/Makefile =================================================================== --- head/devel/ccache/Makefile (revision 481182) +++ head/devel/ccache/Makefile (revision 481183) @@ -1,145 +1,152 @@ # Created by: Dominic Marks # $FreeBSD$ PORTNAME= ccache -PORTVERSION= 3.4.2 -PORTREVISION= 1 +.if defined(OPTIONS_SLAVE) && ${OPTIONS_SLAVE:MMEMCACHED} +PORTVERSION= 3.5.dev.20180926 +.else +PORTVERSION= 3.4.3 +.endif +PORTREVISION= 0 CATEGORIES= devel MASTER_SITES= https://www.samba.org/ftp/ccache/ \ LOCAL/bdrewery MAINTAINER= bdrewery@FreeBSD.org COMMENT= Tool to minimize the compile time of C/C++ programs LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/GPL-3.0.txt CONFLICTS_INSTALL?= ccache-static-[0-9]* ccache-memcached-[0-9]* ccache-memcached-static-[0-9]* GNU_CONFIGURE= yes HOWTO= ccache-howto-freebsd.txt CCLINKDIR= libexec/ccache SUB_FILES= ${HOWTO} world-ccache pkg-message ccache-update-links.sh PORTDOCS= ccache-howto-freebsd.txt MANUAL.html MANUAL.adoc NEWS.adoc \ NEWS.html OPTIONS_DEFINE= CLANGLINK LLVMLINK STATIC DOCS TINDERBOX MEMCACHED OPTIONS_DEFAULT=CLANGLINK LLVMLINK CLANGLINK_DESC= Create clang compiler links if clang is installed LLVMLINK_DESC= Create llvm compiler links if llvm is installed TINDERBOX_DESC= Create tarball for tinderbox usage MEMCACHED_DESC= Build in experimental Memcached support USES= compiler MEMCACHED_EXTRA_PATCHES= \ ${FILESDIR}/extra-patch-memcached-configure.ac \ ${FILESDIR}/extra-patch-memcached-Makefile.in MEMCACHED_CONFIGURE_ENABLE= memcached MEMCACHED_USES= autoreconf gmake pkgconfig MEMCACHED_LIB_DEPENDS= libmemcached.so:databases/libmemcached MEMCACHED_LDFLAGS= -L${LOCALBASE}/lib MEMCACHED_CFLAGS= -I${LOCALBASE}/include STATIC_CONFIGURE_ENABLE= static .if defined(WITH_CCACHE_BUILD) && empty(OPTIONS_SLAVE:MMEMCACHED) && \ !defined(NO_CCACHE_DEPEND) # Don't allow autoreconf. We want no dependencies on this to keep # WITH_CCACHE_BUILD working. USES:= ${USES:Nautoreconf} MEMCACHED_IGNORE= MEMCACHED cannot be combined with WITH_CCACHE_BUILD. Use devel/ccache-memcached # XXX: This needs more testing with Poudriere before enabling. Also bsd.options.mk support. #MEMCACHED_DEPENDS_ARGS+= NO_CCACHE_DEPEND=1 .endif # Support WITH_CCACHE_BUILD but don't depend on it. NO_CCACHE_DEPEND= yes OPTIONS_SUB= yes STATIC_LDFLAGS= -static .include .if ${PORT_OPTIONS:MMEMCACHED} USE_GITHUB= yes -GH_TAGNAME= dd9123d3bc0763ef7133330e20ca3e3409a08904 +GH_TAGNAME= f7712082106bef085515f86ae47e7dbbd2a48b57 MASTER_SITES= DISTINFO_FILE= ${MASTERDIR}/distinfo.memcached BUILD_DEPENDS+= ${LOCALBASE}/bin/a2x:textproc/asciidoc ALL_TARGET= all docs +.else +# Only needed pre-3.5 +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-configure.ac .endif .include . if ${COMPILER_TYPE} == clang CPPFLAGS+= -DCC_IS_CLANG . elif ${COMPILER_TYPE} == gcc CPPFLAGS+= -DCC_IS_GCC . endif PLIST_SUB+= CCLINKDIR="${CCLINKDIR}" .if ${ARCH}=="i386" CCACHE_COMPILERS+= icc icpc .endif GNU_COMPILERS+= 34 42 43 44 45 46 47 48 49 5 6 7 8 CCACHE_COMPILERS+= cc c++ CC gcc g++ ${GNU_COMPILERS:S|^|gcc|} ${GNU_COMPILERS:S|^|g++|} .if ${PORT_OPTIONS:MCLANGLINK} CLANG_COMPILERS+= 33 34 35 36 37 38 39 40 50 60 70 -devel CCACHE_COMPILERS+= clang clang++ ${CLANG_COMPILERS:S|^|clang|} ${CLANG_COMPILERS:S|^|clang++|} .endif .if ${PORT_OPTIONS:MLLVMLINK} CCACHE_COMPILERS+= llvm-gcc llvm-c++ llvm-g++ .endif CCACHE_COMPILERS+= ${EXTRA_COMPILERS} SUB_LIST+= CCACHE_COMPILERS="${CCACHE_COMPILERS}" \ CCLINKDIR="${CCLINKDIR}" \ ICCPREFIX="${LOCALBASE}/intel_cc_80/bin" \ HOWTO="${HOWTO}" post-patch-MEMCACHED-off: @${REINPLACE_CMD} \ -e 's,_XOPEN_SOURCE 600,_XOPEN_SOURCE 700,' \ -e 's,_POSIX_C_SOURCE 200112L,_POSIX_C_SOURCE 200809L,' \ ${WRKSRC}/configure post-build-TINDERBOX-on: @${MKDIR} ${WRKDIR}/tb/opt ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${WRKDIR}/tb/opt .for l in ${CCACHE_COMPILERS} @${LN} -sf ${PORTNAME} ${WRKDIR}/tb/opt/${l} .endfor @${TAR} -C ${WRKDIR}/tb -cpf ${WRKSRC}/${PORTNAME}.tar opt do-install: ${INSTALL_PROGRAM} ${WRKSRC}/ccache ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/doc/ccache.1 ${STAGEDIR}${PREFIX}/man/man1 ${MKDIR} ${STAGEDIR}${PREFIX}/${CCLINKDIR}/world ${INSTALL_SCRIPT} ${WRKDIR}/world-ccache \ ${STAGEDIR}${PREFIX}/${CCLINKDIR}/world/ccache ${INSTALL_SCRIPT} ${WRKDIR}/ccache-update-links.sh \ ${STAGEDIR}${PREFIX}/bin/ccache-update-links do-install-TINDERBOX-on: ${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.tar ${STAGEDIR}${DATADIR} do-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/doc/MANUAL.html ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/doc/MANUAL.adoc ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/doc/NEWS.adoc ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/doc/NEWS.html ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKDIR}/${HOWTO} ${STAGEDIR}${DOCSDIR} .include Index: head/devel/ccache/distinfo =================================================================== --- head/devel/ccache/distinfo (revision 481182) +++ head/devel/ccache/distinfo (revision 481183) @@ -1,3 +1,3 @@ -TIMESTAMP = 1530039944 -SHA256 (ccache-3.4.2.tar.gz) = b2264923c63e2b90a17cf56acb1df3f4229c416fb88e476e5ec7e02919d319c3 -SIZE (ccache-3.4.2.tar.gz) = 460637 +TIMESTAMP = 1538593366 +SHA256 (ccache-3.4.3.tar.gz) = 6ee63d919274da937cbcb2870da16a3b386e100f7f942ea8b7f081652df3d00b +SIZE (ccache-3.4.3.tar.gz) = 466575 Index: head/devel/ccache/distinfo.memcached =================================================================== --- head/devel/ccache/distinfo.memcached (revision 481182) +++ head/devel/ccache/distinfo.memcached (revision 481183) @@ -1,3 +1,3 @@ -TIMESTAMP = 1530040182 -SHA256 (ccache-ccache-3.4.2-dd9123d3bc0763ef7133330e20ca3e3409a08904_GH0.tar.gz) = 842b55b091f21878c4d4eb3900fa7501f632af5d39d42b5cb81ce47d231da40f -SIZE (ccache-ccache-3.4.2-dd9123d3bc0763ef7133330e20ca3e3409a08904_GH0.tar.gz) = 358431 +TIMESTAMP = 1538593371 +SHA256 (ccache-ccache-3.5.dev.20180926-f7712082106bef085515f86ae47e7dbbd2a48b57_GH0.tar.gz) = 7d615ffb6c72b5accc6801d9302cf6109731f605e4b9a08fcb9667a7cbacdd82 +SIZE (ccache-ccache-3.5.dev.20180926-f7712082106bef085515f86ae47e7dbbd2a48b57_GH0.tar.gz) = 367922 Index: head/devel/ccache/files/patch-configure.ac =================================================================== --- head/devel/ccache/files/patch-configure.ac (revision 481182) +++ head/devel/ccache/files/patch-configure.ac (nonexistent) @@ -1,19 +0,0 @@ ---- m4/feature_macros.m4.orig 2017-02-13 15:05:54.405968000 -0800 -+++ m4/feature_macros.m4 2017-02-13 15:16:32.931104000 -0800 -@@ -120,7 +120,7 @@ - Define to the level of X/Open that your system supports) - ;; - *) -- AC_DEFINE(_XOPEN_SOURCE, 600, -+ AC_DEFINE(_XOPEN_SOURCE, 700, - Define to the level of X/Open that your system supports) - ;; - esac -@@ -142,6 +142,6 @@ - ;; - esac - -- AC_DEFINE(_POSIX_C_SOURCE, 200112L, Define to activate features from IEEE Stds 1003.1-2001) -+ AC_DEFINE(_POSIX_C_SOURCE, 200809L, Define to activate features from IEEE Stds 1003.1-2001) - - fi Property changes on: head/devel/ccache/files/patch-configure.ac ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/ccache/files/extra-patch-configure.ac =================================================================== --- head/devel/ccache/files/extra-patch-configure.ac (nonexistent) +++ head/devel/ccache/files/extra-patch-configure.ac (revision 481183) @@ -0,0 +1,19 @@ +--- m4/feature_macros.m4.orig 2017-02-13 15:05:54.405968000 -0800 ++++ m4/feature_macros.m4 2017-02-13 15:16:32.931104000 -0800 +@@ -120,7 +120,7 @@ + Define to the level of X/Open that your system supports) + ;; + *) +- AC_DEFINE(_XOPEN_SOURCE, 600, ++ AC_DEFINE(_XOPEN_SOURCE, 700, + Define to the level of X/Open that your system supports) + ;; + esac +@@ -142,6 +142,6 @@ + ;; + esac + +- AC_DEFINE(_POSIX_C_SOURCE, 200112L, Define to activate features from IEEE Stds 1003.1-2001) ++ AC_DEFINE(_POSIX_C_SOURCE, 200809L, Define to activate features from IEEE Stds 1003.1-2001) + + fi Property changes on: head/devel/ccache/files/extra-patch-configure.ac ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property