Index: head/devel/ccache/Makefile =================================================================== --- head/devel/ccache/Makefile (revision 502125) +++ head/devel/ccache/Makefile (revision 502126) @@ -1,157 +1,163 @@ # Created by: Dominic Marks # $FreeBSD$ PORTNAME= ccache #PORTVERSION must be set later due to depending on PORT_OPTIONS. PORTREVISION= 0 CATEGORIES= devel MASTER_SITES= https://github.com/ccache/ccache/releases/download/v${DISTVERSION}/ \ 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 gmake +USES= compiler MEMCACHED_EXTRA_PATCHES= \ ${FILESDIR}/extra-patch-memcached-configure.ac \ ${FILESDIR}/extra-patch-memcached-Makefile.in MEMCACHED_CONFIGURE_ENABLE= memcached -MEMCACHED_USES= autoreconf pkgconfig +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 empty(OPTIONS_SLAVE:MMEMCACHED) +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-Makefile.in +.endif + .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} # Hack for libsasl2.a requiring HMAC_CTX_reset from hidden libntlm.a. STATIC_LDFLAGS+= -L${LOCALBASE}/lib/sasl2 PORTVERSION= 3.5.dev.20180926 USE_GITHUB= yes GH_TAGNAME= f7712082106bef085515f86ae47e7dbbd2a48b57 MASTER_SITES= DISTINFO_FILE= ${MASTERDIR}/distinfo.memcached .if ${PORT_OPTIONS:MDOCS} BUILD_DEPENDS+= ${LOCALBASE}/bin/a2x:textproc/asciidoc ALL_TARGET= all docs PLIST_FILES+= man/man1/ccache.1.gz .endif .else PORTVERSION= 3.7.1 .endif .include + +.if defined(WITH_CCACHE_BUILD) && empty(OPTIONS_SLAVE:MMEMCACHED) +.if !empty(BUILD_DEPENDS) +.error MAINTAINER NOTE: Cannot have any BUILD_DEPENDS for default ccache packages +.endif +.endif . 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 9 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 80 -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 # Memcached uses the 3.5 dev branch which requires asciidoc to generate # ccache.1. .if !${PORT_OPTIONS:MMEMCACHED} || ${PORT_OPTIONS:MDOCS} ${INSTALL_MAN} ${WRKSRC}/doc/ccache.1 ${STAGEDIR}${PREFIX}/man/man1 .endif ${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/files/extra-patch-Makefile.in =================================================================== --- head/devel/ccache/files/extra-patch-Makefile.in (nonexistent) +++ head/devel/ccache/files/extra-patch-Makefile.in (revision 502126) @@ -0,0 +1,13 @@ +--- Makefile.in.orig 2019-05-20 14:04:00 UTC ++++ Makefile.in +@@ -126,10 +126,6 @@ install: ccache$(EXEEXT) @disable_man@ccache.1 + clean: + rm -rf $(files_to_clean) + +-src/snprintf.o: CFLAGS += @no_implicit_fallthrough_warning@ +-$(zlib_objs): CPPFLAGS += -include config.h +-$(zlib_objs): CFLAGS += @no_implicit_fallthrough_warning@ +- + src/zlib/libz.a: $(zlib_objs) + $(if $(quiet),@echo " AR $@") + $(Q)$(AR) cr $@ $(zlib_objs) Property changes on: head/devel/ccache/files/extra-patch-Makefile.in ___________________________________________________________________ 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 Index: head/devel/gettext-runtime/Makefile =================================================================== --- head/devel/gettext-runtime/Makefile (revision 502125) +++ head/devel/gettext-runtime/Makefile (revision 502126) @@ -1,50 +1,49 @@ # $FreeBSD$ # NOTE: before committing to this port, contact portmgr to arrange for an # experimental ports run. Untested commits may be backed out at portmgr's # discretion. PORTNAME= gettext-runtime PORTREVISION= 2 COMMENT= GNU gettext runtime libraries and programs LICENSE= LGPL21 GPLv3 LICENSE_COMB= multi LICENSE_FILE_LGPL21= ${WRKSRC}/intl/COPYING.LIB LICENSE_FILE_GPLv3= ${WRKSRC}/../COPYING .include "${.CURDIR}/../gettext/Makefile.common" GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-csharp --disable-java --with-included-gettext \ ac_cv_lib_rt_sched_yield=no INSTALL_TARGET= install-strip TEST_TARGET= check USES= charsetfix cpe iconv libtool tar:xz USE_LDCONFIG= yes WRKSRC_SUBDIR= gettext-runtime INFO= autosprintf CPE_PRODUCT= gettext CPE_VENDOR= gnu -NO_CCACHE= yes .include .if ${OPSYS} == DragonFly CONFIGURE_ARGS+=--disable-threads .endif post-patch: # Do not install csharp and java documentation. @${REINPLACE_CMD} -E '/^SUBDIRS =/s/(intl-csharp|intl-java)//g' \ ${WRKSRC}/Makefile.in # Do not install html copies of manpages. @${REINPLACE_CMD} \ -e '/^all-local:/s/html-local//' \ -e '/^install-data-local:/s/install-html//' \ -e '/^installdirs-local:/s/installdirs-html//' \ ${WRKSRC}/libasprintf/Makefile.in ${WRKSRC}/man/Makefile.in .include Index: head/devel/gmake/Makefile =================================================================== --- head/devel/gmake/Makefile (revision 502125) +++ head/devel/gmake/Makefile (revision 502126) @@ -1,37 +1,35 @@ # Created by: jkh # $FreeBSD$ PORTNAME= gmake PORTVERSION= 4.2.1 PORTREVISION= 3 CATEGORIES= devel MASTER_SITES= GNU/make DISTNAME= make-${PORTVERSION} # note: before committing to this port, contact portmgr to arrange for an # experimental ports run. Untested commits may be backed out at portmgr's # discretion. MAINTAINER= tijl@FreeBSD.org COMMENT= GNU version of 'make' utility LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING GNU_CONFIGURE= yes CONFIGURE_ARGS= --program-prefix=g \ --without-guile USES= cpe tar:bzip2 CPE_VENDOR= gnu -NO_CCACHE= yes - OPTIONS_DEFINE= NLS OPTIONS_SUB= yes NLS_USES= gettext-runtime NLS_CONFIGURE_ENABLE= nls INFO= make .include Index: head/print/indexinfo/Makefile =================================================================== --- head/print/indexinfo/Makefile (revision 502125) +++ head/print/indexinfo/Makefile (revision 502126) @@ -1,24 +1,23 @@ # $FreeBSD$ PORTNAME= indexinfo PORTVERSION= 0.3.1 CATEGORIES= print ports-mgmt MAINTAINER= bapt@FreeBSD.org COMMENT= Utility to regenerate the GNU info page index LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING USE_CSTD= gnu99 USE_GITHUB= yes GH_ACCOUNT= bapt INSTALL_TARGET= install-strip PLIST_FILES= bin/indexinfo -NO_CCACHE= yes .if exists(/usr/include/sys/capsicum.h) CFLAGS+= -DHAVE_CAPSICUM .endif .include