Index: branches/2018Q4/databases/couchdb2/Makefile =================================================================== --- branches/2018Q4/databases/couchdb2/Makefile (revision 487882) +++ branches/2018Q4/databases/couchdb2/Makefile (revision 487883) @@ -1,109 +1,110 @@ # Created by: Dave Cottlehuber # $FreeBSD$ PORTNAME= couchdb2 DISTVERSION= 2.3.0 +PORTREVISION= 1 CATEGORIES= databases MASTER_SITES= APACHE/couchdb/source/${DISTVERSION} DISTNAME= apache-couchdb-${DISTVERSION} MAINTAINER= dch@FreeBSD.org COMMENT= JSON document database with HTTP API and scalable multi-master sync LICENSE= APACHE20 BSD3CLAUSE ISCL WTFPL OFL11 LICENSE_COMB= multi BUILD_DEPENDS= rebar:devel/rebar LIB_DEPENDS= libicudata.so:devel/icu \ libmozjs185.so:lang/spidermonkey185 RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} USES= cpe gmake libtool ncurses python:run shebangfix USE_RC_SUBR= couchdb2 CPE_VENDOR= apache SHEBANG_FILES= rel/overlay/bin/couchup USERS= couchdb GROUPS= couchdb SUB_FILES= pkg-message SUB_LIST= APPDIR=${APPDIR} ERL_PATH=${ERL_PATH} PORTNAME=${PORTNAME} RELDIR=${RELDIR} PLIST_SUB= VERSION=${DISTVERSION} HAS_CONFIGURE= yes CONFIGURE_ARGS= --skip-deps --user ${USERS} --disable-docs --disable-fauxton ALL_TARGET= release OPTIONS_DEFINE= DOCS OPTIONS_DEFAULT=OTP21 OPTIONS_SUB= yes OPTIONS_SINGLE= ENV OPTIONS_SINGLE_ENV=OTP20 OTP21 OTP20_DESC= Use Erlang OTP20 OTP20_BUILD_DEPENDS=${LOCALBASE}/lib/erlang20/bin/erlc:lang/erlang-runtime20 OTP20_RUN_DEPENDS=${LOCALBASE}/lib/erlang20/bin/erl:lang/erlang-runtime20 OTP20_MAKE_ENV= PATH=${LOCALBASE}/lib/erlang20/bin:${PATH} OTP20_VARS= ERL_PATH=${LOCALBASE}/lib/erlang20/bin/erl OTP21_DESC= Use Erlang OTP21 OTP21_BUILD_DEPENDS=${LOCALBASE}/lib/erlang21/bin/erlc:lang/erlang-runtime21 OTP21_RUN_DEPENDS=${LOCALBASE}/lib/erlang21/bin/erl:lang/erlang-runtime21 OTP21_MAKE_ENV= PATH=${LOCALBASE}/lib/erlang21/bin:${PATH} OTP21_VARS= ERL_PATH=${LOCALBASE}/lib/erlang21/bin/erl DBDIR?= /var/db/${PORTNAME} LOGFILE?= /var/log/${PORTNAME}/couch.log APPDIR= ${LOCALBASE}/libexec/${PORTNAME} RELDIR= ${APPDIR}/releases/${DISTVERSION} post-patch: @${REINPLACE_CMD} \ -e 's,%%APPDIR%%,${APPDIR},g' \ -e 's,%%DATADIR%%,${DATADIR},g' \ -e 's,%%DBDIR%%,${DBDIR},g' \ -e 's,%%LOCALBASE%%,${LOCALBASE},g' \ -e 's,%%PORTNAME%%,${PORTNAME},g' \ -e 's,%%WWWDIR%%,${WWWDIR},g' \ -e 's,\$COUCHDB_USER,${USERS},g' \ -e 's,\$LOG_FILE,${LOGFILE},g' \ ${WRKSRC}/configure pre-install: # relocate user-modifiable runtime configs to match hier(7) ${MKDIR} ${STAGEDIR}${ETCDIR} ${INSTALL_DATA} ${WRKSRC}/rel/couchdb/etc/local.ini \ ${STAGEDIR}${ETCDIR}/local.ini.sample ${INSTALL_DATA} ${WRKSRC}/rel/couchdb/etc/vm.args \ ${STAGEDIR}${ETCDIR}/vm.args.sample ${INSTALL_MAN} ${WRKSRC}/share/docs/man/apachecouchdb.1 \ ${STAGEDIR}${MANPREFIX}/man/man1 # prune build artefacts and surplus headers @${FIND} -E ${WRKSRC} -type f \ -regex '.*\.(a|buildinfo|c|cc|cmd|d|h|o|orig|1)' -delete # remove runtime dirs and files that were moved to match hier(7) @${RM} -r ${WRKSRC}/rel/couchdb/var \ ${WRKSRC}/rel/couchdb/etc/*.d \ ${WRKSRC}/rel/couchdb/etc/local.ini \ ${WRKSRC}/rel/couchdb/etc/vm.args \ ${WRKSRC}/rel/couchdb/releases/*/vm.args \ ${WRKSRC}/rel/couchdb/lib/couch-*/priv/couchjs \ ${WRKSRC}/share/server @${CP} ${WRKSRC}/src/docs/images/favicon.ico ${WRKSRC}/share/www/ (cd ${WRKSRC}/rel/couchdb && ${COPYTREE_SHARE} . ${STAGEDIR}${APPDIR}) post-install: @${FIND} -E ${STAGEDIR} -type f \ \( -name couchjs -o -name *.so \) \ -exec ${STRIP_CMD} {} + @${MKDIR} \ ${STAGEDIR}/var/db/${PORTNAME} \ ${STAGEDIR}/var/log/${PORTNAME} # fauxton UI is a required component (cd ${WRKSRC}/share/www && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}) post-install-DOCS-on: (cd ${WRKSRC}/share/docs/html && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}/docs) .include Index: branches/2018Q4/lang/erlang-runtime21/Makefile =================================================================== --- branches/2018Q4/lang/erlang-runtime21/Makefile (revision 487882) +++ branches/2018Q4/lang/erlang-runtime21/Makefile (revision 487883) @@ -1,146 +1,147 @@ # Created by: ruslan@shevchenko.kiev.ua # $FreeBSD$ PORTNAME= erlang PORTVERSION= 21.1 +# NB when bumping OTP versions also bump PORTREVISION in databases/couchdb2 CATEGORIES= lang parallel java MASTER_SITES= http://www.erlang.org/download/:erlangorg \ http://erlang.stacken.kth.se/download/:erlangorg \ http://www.csd.uu.se/ftp/mirror/erlang/download/:erlangorg \ http://olgeni.olgeni.com/~olgeni/distfiles/:local \ LOCAL/olgeni:local PKGNAMESUFFIX= -runtime21 DISTNAME= otp_src_${ERLANG_REL} DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:erlangorg \ preloaded-${PORTVERSION}${EXTRACT_SUFX}:local DIST_SUBDIR= erlang EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} PATCH_SITES= http://olgeni.olgeni.com/~olgeni/distfiles/ \ LOCAL/olgeni PATCHFILES= MAINTAINER= erlang@FreeBSD.org COMMENT= Functional programming language from Ericsson LICENSE= APACHE20 BROKEN_sparc64= Fails to build: error: fp_except undeclared WRKSRC= ${WRKDIR}/otp_src_${ERLANG_REL} ERLANG_LIB= ${PORTNAME}${PORTVERSION:C/\..*//} ERLANG_REL= 21.1 OPTIONS_SUB= yes SUB_FILES= pkg-message SUB_LIST= ERLANG_LIB=${ERLANG_LIB} MAKE_JOBS_UNSAFE=yes OPTIONS_DEFINE= DIRTY DTRACE GS HIPE JAVA KQUEUE NATIVE ODBC OPENSSL SCTP THREADS WX OPTIONS_DEFAULT=DIRTY DTRACE HIPE KQUEUE OPENSSL SCTP THREADS DIRTY_DESC= Enable Dirty schedulers GS_DESC= Enable GS application (deprecated) HIPE_DESC= Build native HiPE compiler KQUEUE_DESC= Enable Kernel Poll (kqueue) support NATIVE_DESC= Enable native libraries SCTP_DESC= Enable SCTP support WX_DESC= Enable WX application NATIVE_IMPLIES= HIPE .if !exists(/usr/sbin/dtrace) OPTIONS_EXCLUDE+= DTRACE .endif # If you run Erlang and get a message resembling "WARNING: number of # probes fixed does not match the number of defined probes (54 != 132, # respectively)" you probably misconfigured DTrace in some way. OPTIONS_EXCLUDE_DragonFly= HIPE NATIVE SCTP OPTIONS_EXCLUDE_FreeBSD_10= DTRACE # ld(1) fails to link probes: missing __dtrace_erlang___* symbols OPTIONS_EXCLUDE_aarch64= DTRACE OPTIONS_EXCLUDE_armv6= DTRACE OPTIONS_EXCLUDE_armv7= DTRACE OPTIONS_EXCLUDE_i386= DTRACE OPENSSL_VARS= BROKEN_SSL=openssl-devel GNU_CONFIGURE= yes LDFLAGS+= -L${LOCALBASE}/lib USES= gmake ncurses perl5 USE_PERL5= build CONFIGURE_ENABLE= smp-support DIRTY_CONFIGURE_ENABLE= dirty-schedulers DTRACE_CFLAGS= -fno-omit-frame-pointer DTRACE_CONFIGURE_WITH= dynamic-trace=dtrace DTRACE_VARS= STRIP="" GS_USES= tk:run HIPE_CONFIGURE_ENABLE= hipe JAVA_CONFIGURE_ENV= ac_cv_prog_JAVAC="${JAVAC}" JAVA_CONFIGURE_WITH= javac JAVA_VARS= USE_JAVA=yes KQUEUE_CONFIGURE_ENABLE=kernel-poll NATIVE_CONFIGURE_ENABLE=native-libs ODBC_CONFIGURE_WITH= odbc ODBC_LIB_DEPENDS= libodbc.so:databases/unixODBC OPENSSL_CONFIGURE_WITH= ssl=${OPENSSLBASE} OPENSSL_USES= ssl SCTP_CONFIGURE_ENABLE= sctp THREADS_CONFIGURE_ENABLE= threads WX_CONFIGURE_WITH= wx-config=${WX_CONFIG} WX_VARS= USE_WX=2.8+ WX_COMPS="wx contrib" USE_GL="gl glu" .include .if ${OPSYS} == FreeBSD && ${OSVERSION} > 1100000 CFLAGS+= -DMAP_NORESERVE=0 .endif .if ${ARCH} == i386 MAKE_ARGS+= ARCH=x86 .endif .if ${ARCH} == armv6 || ${ARCH} == armv7 MAKE_ARGS+= ARCH=arm .endif pre-configure: cd ${WRKSRC} && ${TAR} --unlink -xzpf ${DISTDIR}/${DIST_SUBDIR}/preloaded-${PORTVERSION}${EXTRACT_SUFX} pre-configure-MX-off: echo "disabled by port options" > ${WRKSRC}/lib/wx/SKIP post-configure-ODBC-on: ${RM} ${WRKSRC}/lib/odbc/SKIP pre-build-NATIVE-on: @cd ${WRKSRC} && ${MAKE_CMD} clean post-install-GS-off: ${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/gs-* post-install-JAVA-off: ${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/jinterface-* post-install-ODBC-off: ${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/odbc-* post-install-OPENSSL-off: ${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/crypto-* ${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/ssh-* ${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/ssl-* post-install-WX-off: ${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/wx-* post-stage: ${FIND} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/* -type d -empty -delete @cd ${STAGEDIR}${PREFIX}; ${FIND} lib/${ERLANG_LIB}/* -type f -o -type l \ | ${SORT} >> ${TMPPLIST} .include Index: branches/2018Q4 =================================================================== --- branches/2018Q4 (revision 487882) +++ branches/2018Q4 (revision 487883) Property changes on: branches/2018Q4 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r487873