diff --git a/UPDATING b/UPDATING --- a/UPDATING +++ b/UPDATING @@ -5,6 +5,13 @@ You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20240815: + AFFECTS: users of devel/subversion-lts and devel/subversion + AUTHOR: michaelo@FreeBSD.org + + The port option STATIC has been broken since 2022-01 because textproc/utf8proc + does not provide an archive with CMake. Therefore, it has been removed. + 20240809: AFFECTS: sysutils/amavisd-new AUTHOR: netchildFreeBSD.org diff --git a/devel/subversion-lts/Makefile b/devel/subversion-lts/Makefile --- a/devel/subversion-lts/Makefile +++ b/devel/subversion-lts/Makefile @@ -1,4 +1,4 @@ -PORTREVISION= 3 +PORTREVISION= 4 PKGNAMESUFFIX= -lts MAINTAINER= michaelo@apache.org @@ -18,7 +18,6 @@ NLS \ SASL \ SERF \ - STATIC \ SVNSERVE_WRAPPER\ TEST \ TOOLS @@ -27,7 +26,6 @@ GPG_AGENT_DESC= Enable GPG agent password store SERF_DESC= WebDAV/Delta-V (HTTP/HTTPS) repo access module -STATIC_DESC= No shared libs (disables SVN integration) SVNSERVE_WRAPPER_DESC= Enable svnserve wrapper (umask setter) TEST_DESC= Run subversion test suite TOOLS_DESC= Install several tools @@ -67,18 +65,6 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} .endif -.if ${PORT_OPTIONS:MSTATIC} -. if ${PORT_OPTIONS:MNLS} -USES+= gettext-tools -. endif -. if ${PORT_OPTIONS:MBDB} -BDB_BUILD_DEPENDS= yes -. endif -OLD_LIB_DEPENDS:= ${LIB_DEPENDS:S!^!${LOCALBASE}/lib/!:C!(\.so|\.[0-9]+)?:!.a:!} -BUILD_DEPENDS+= ${OLD_LIB_DEPENDS} -LIB_DEPENDS= -.endif - .if make(repository) WITH_REPOSITORY_CREATION= yes .endif @@ -116,9 +102,6 @@ .endif @${ECHO_MSG} "" -.if ${PORT_OPTIONS:MSTATIC} - @${ECHO_MSG} "Static binaries will be built." -.endif # STATIC @${ECHO_MSG} "Many useful scripts will be installed into ${DATADIR}" pre-configure: @@ -134,12 +117,6 @@ ${FALSE} ; \ fi .endif -.if ${PORT_OPTIONS:MSTATIC} -LIBS_SQLITE3!= pkgconf --libs --static sqlite3 -LIBS+= ${LIBS_SQLITE3} -# for work with ICU -LIBS+= -lc++ -lm -.endif post-configure: # Enable GNOME Keyring / KWallet support in main code, as it is harmless @@ -161,14 +138,12 @@ for F in ${BINS_TO_STRIP} ; do \ ${STRIP_CMD} "${STAGEDIR}${PREFIX}/bin/$${F}" ; \ done + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so @${MKDIR} ${STAGEDIR}${DATADIR} (cd ${WRKSRC}/tools.examples && ${TAR} --exclude '*.in' -cf - * | ${TAR} -C ${STAGEDIR}${DATADIR} -xof - ) @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} -post-install-STATIC-off: - -@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so - post-install-SVNSERVE_WRAPPER-on: @${INSTALL_SCRIPT} ${FILESDIR}/svnserve.wrapper ${STAGEDIR}${PREFIX}/bin/svnserve.sample diff --git a/devel/subversion-lts/Makefile.common b/devel/subversion-lts/Makefile.common --- a/devel/subversion-lts/Makefile.common +++ b/devel/subversion-lts/Makefile.common @@ -22,8 +22,7 @@ libutf8proc.so:textproc/utf8proc \ liblz4.so:archivers/liblz4 -CONFIGURE_ARGS+= --with-sqlite=${LOCALBASE} \ - --with-expat=${LOCALBASE}/include:${LOCALBASE}/lib:expat +CONFIGURE_ARGS+= --with-expat=${LOCALBASE}/include:${LOCALBASE}/lib:expat # =============================================================== OPTIONS_SUB= yes @@ -48,8 +47,6 @@ GPG_AGENT_BUILD_DEPENDS= gpg-agent:security/gnupg GPG_AGENT_RUN_DEPENDS= gpg-agent:security/gnupg -STATIC_CONFIGURE_ON= --enable-all-static PKG_CONFIG="${LOCALBASE}/bin/pkg-config --static" - # =============================================================== .include @@ -71,16 +68,6 @@ .include -pre-everything:: -.if defined(SVN_BUILD_ADDONS) -.if ${PORT_OPTIONS:MSTATIC} || ${OPTIONS_FILE_SET:MSTATIC} - @${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" - @${ECHO_MSG} "!!! addons (bindings, mod_dav_svn, etc). and static build are not compatible !!!" - @${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" - @${FALSE} -.endif -.endif - pre-patch: .if defined(SVN_BUILD_ADDONS) @${CP} ${FILESDIR}/build-outputs.mk.addons ${WRKSRC}/build-outputs.mk diff --git a/devel/subversion-lts/pkg-plist b/devel/subversion-lts/pkg-plist --- a/devel/subversion-lts/pkg-plist +++ b/devel/subversion-lts/pkg-plist @@ -72,65 +72,65 @@ include/subversion-1/svn_x509.h include/subversion-1/svn_xml.h lib/libsvn_client-1.a -%%NO_STATIC%%lib/libsvn_client-1.so -%%NO_STATIC%%lib/libsvn_client-1.so.0 -%%NO_STATIC%%lib/libsvn_client-1.so.0.0.0 +lib/libsvn_client-1.so +lib/libsvn_client-1.so.0 +lib/libsvn_client-1.so.0.0.0 lib/libsvn_delta-1.a -%%NO_STATIC%%lib/libsvn_delta-1.so -%%NO_STATIC%%lib/libsvn_delta-1.so.0 -%%NO_STATIC%%lib/libsvn_delta-1.so.0.0.0 +lib/libsvn_delta-1.so +lib/libsvn_delta-1.so.0 +lib/libsvn_delta-1.so.0.0.0 lib/libsvn_diff-1.a -%%NO_STATIC%%lib/libsvn_diff-1.so -%%NO_STATIC%%lib/libsvn_diff-1.so.0 -%%NO_STATIC%%lib/libsvn_diff-1.so.0.0.0 +lib/libsvn_diff-1.so +lib/libsvn_diff-1.so.0 +lib/libsvn_diff-1.so.0.0.0 lib/libsvn_fs-1.a -%%NO_STATIC%%lib/libsvn_fs-1.so -%%NO_STATIC%%lib/libsvn_fs-1.so.0 -%%NO_STATIC%%lib/libsvn_fs-1.so.0.0.0 +lib/libsvn_fs-1.so +lib/libsvn_fs-1.so.0 +lib/libsvn_fs-1.so.0.0.0 %%BDB%%lib/libsvn_fs_base-1.a -%%NO_STATIC%%%%BDB%%lib/libsvn_fs_base-1.so -%%NO_STATIC%%%%BDB%%lib/libsvn_fs_base-1.so.0 -%%NO_STATIC%%%%BDB%%lib/libsvn_fs_base-1.so.0.0.0 +%%BDB%%lib/libsvn_fs_base-1.so +%%BDB%%lib/libsvn_fs_base-1.so.0 +%%BDB%%lib/libsvn_fs_base-1.so.0.0.0 lib/libsvn_fs_fs-1.a -%%NO_STATIC%%lib/libsvn_fs_fs-1.so -%%NO_STATIC%%lib/libsvn_fs_fs-1.so.0 -%%NO_STATIC%%lib/libsvn_fs_fs-1.so.0.0.0 +lib/libsvn_fs_fs-1.so +lib/libsvn_fs_fs-1.so.0 +lib/libsvn_fs_fs-1.so.0.0.0 lib/libsvn_fs_util-1.a -%%NO_STATIC%%lib/libsvn_fs_util-1.so -%%NO_STATIC%%lib/libsvn_fs_util-1.so.0 -%%NO_STATIC%%lib/libsvn_fs_util-1.so.0.0.0 +lib/libsvn_fs_util-1.so +lib/libsvn_fs_util-1.so.0 +lib/libsvn_fs_util-1.so.0.0.0 lib/libsvn_fs_x-1.a -%%NO_STATIC%%lib/libsvn_fs_x-1.so -%%NO_STATIC%%lib/libsvn_fs_x-1.so.0 -%%NO_STATIC%%lib/libsvn_fs_x-1.so.0.0.0 +lib/libsvn_fs_x-1.so +lib/libsvn_fs_x-1.so.0 +lib/libsvn_fs_x-1.so.0.0.0 lib/libsvn_ra-1.a -%%NO_STATIC%%lib/libsvn_ra-1.so -%%NO_STATIC%%lib/libsvn_ra-1.so.0 -%%NO_STATIC%%lib/libsvn_ra-1.so.0.0.0 +lib/libsvn_ra-1.so +lib/libsvn_ra-1.so.0 +lib/libsvn_ra-1.so.0.0.0 lib/libsvn_ra_local-1.a -%%NO_STATIC%%lib/libsvn_ra_local-1.so -%%NO_STATIC%%lib/libsvn_ra_local-1.so.0 -%%NO_STATIC%%lib/libsvn_ra_local-1.so.0.0.0 +lib/libsvn_ra_local-1.so +lib/libsvn_ra_local-1.so.0 +lib/libsvn_ra_local-1.so.0.0.0 %%SERF%%lib/libsvn_ra_serf-1.a -%%NO_STATIC%%%%SERF%%lib/libsvn_ra_serf-1.so -%%NO_STATIC%%%%SERF%%lib/libsvn_ra_serf-1.so.0 -%%NO_STATIC%%%%SERF%%lib/libsvn_ra_serf-1.so.0.0.0 +%%SERF%%lib/libsvn_ra_serf-1.so +%%SERF%%lib/libsvn_ra_serf-1.so.0 +%%SERF%%lib/libsvn_ra_serf-1.so.0.0.0 lib/libsvn_ra_svn-1.a -%%NO_STATIC%%lib/libsvn_ra_svn-1.so -%%NO_STATIC%%lib/libsvn_ra_svn-1.so.0 -%%NO_STATIC%%lib/libsvn_ra_svn-1.so.0.0.0 +lib/libsvn_ra_svn-1.so +lib/libsvn_ra_svn-1.so.0 +lib/libsvn_ra_svn-1.so.0.0.0 lib/libsvn_repos-1.a -%%NO_STATIC%%lib/libsvn_repos-1.so -%%NO_STATIC%%lib/libsvn_repos-1.so.0 -%%NO_STATIC%%lib/libsvn_repos-1.so.0.0.0 +lib/libsvn_repos-1.so +lib/libsvn_repos-1.so.0 +lib/libsvn_repos-1.so.0.0.0 lib/libsvn_subr-1.a -%%NO_STATIC%%lib/libsvn_subr-1.so -%%NO_STATIC%%lib/libsvn_subr-1.so.0 -%%NO_STATIC%%lib/libsvn_subr-1.so.0.0.0 +lib/libsvn_subr-1.so +lib/libsvn_subr-1.so.0 +lib/libsvn_subr-1.so.0.0.0 lib/libsvn_wc-1.a -%%NO_STATIC%%lib/libsvn_wc-1.so -%%NO_STATIC%%lib/libsvn_wc-1.so.0 -%%NO_STATIC%%lib/libsvn_wc-1.so.0.0.0 +lib/libsvn_wc-1.so +lib/libsvn_wc-1.so.0 +lib/libsvn_wc-1.so.0.0.0 libdata/pkgconfig/libsvn_client.pc libdata/pkgconfig/libsvn_delta.pc libdata/pkgconfig/libsvn_diff.pc diff --git a/devel/subversion/Makefile b/devel/subversion/Makefile --- a/devel/subversion/Makefile +++ b/devel/subversion/Makefile @@ -1,4 +1,4 @@ -PORTREVISION= 7 +PORTREVISION= 8 MAINTAINER= michaelo@apache.org COMMENT= Version control system @@ -17,7 +17,6 @@ NLS \ SASL \ SERF \ - STATIC \ SVNSERVE_WRAPPER\ TEST \ TOOLS @@ -26,7 +25,6 @@ GPG_AGENT_DESC= Enable GPG agent password store SERF_DESC= WebDAV/Delta-V (HTTP/HTTPS) repo access module -STATIC_DESC= No shared libs (disables SVN integration) SVNSERVE_WRAPPER_DESC= Enable svnserve wrapper (umask setter) TEST_DESC= Run subversion test suite TOOLS_DESC= Install several tools @@ -66,18 +64,6 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} .endif -.if ${PORT_OPTIONS:MSTATIC} -. if ${PORT_OPTIONS:MNLS} -USES+= gettext-tools -. endif -. if ${PORT_OPTIONS:MBDB} -BDB_BUILD_DEPENDS= yes -. endif -OLD_LIB_DEPENDS:= ${LIB_DEPENDS:S!^!${LOCALBASE}/lib/!:C!(\.so|\.[0-9]+)?:!.a:!} -BUILD_DEPENDS+= ${OLD_LIB_DEPENDS} -LIB_DEPENDS= -.endif - .if make(repository) WITH_REPOSITORY_CREATION= yes .endif @@ -115,9 +101,6 @@ .endif @${ECHO_MSG} "" -.if ${PORT_OPTIONS:MSTATIC} - @${ECHO_MSG} "Static binaries will be built." -.endif # STATIC @${ECHO_MSG} "Many useful scripts will be installed into ${DATADIR}" pre-configure: @@ -133,12 +116,6 @@ ${FALSE} ; \ fi .endif -.if ${PORT_OPTIONS:MSTATIC} -LIBS_SQLITE3!= pkgconf --libs --static sqlite3 -LIBS+= ${LIBS_SQLITE3} -# for work with ICU -LIBS+= -lc++ -lm -.endif post-configure: # Enable GNOME Keyring / KWallet support in main code, as it is harmless @@ -160,14 +137,12 @@ for F in ${BINS_TO_STRIP} ; do \ ${STRIP_CMD} "${STAGEDIR}${PREFIX}/bin/$${F}" ; \ done + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so @${MKDIR} ${STAGEDIR}${DATADIR} (cd ${WRKSRC}/tools.examples && ${TAR} --exclude '*.in' -cf - * | ${TAR} -C ${STAGEDIR}${DATADIR} -xof - ) @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} -post-install-STATIC-off: - -@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so - post-install-SVNSERVE_WRAPPER-on: @${INSTALL_SCRIPT} ${FILESDIR}/svnserve.wrapper ${STAGEDIR}${PREFIX}/bin/svnserve.sample diff --git a/devel/subversion/Makefile.common b/devel/subversion/Makefile.common --- a/devel/subversion/Makefile.common +++ b/devel/subversion/Makefile.common @@ -22,8 +22,7 @@ libutf8proc.so:textproc/utf8proc \ liblz4.so:archivers/liblz4 -CONFIGURE_ARGS+= --with-sqlite=${LOCALBASE} \ - --with-expat=${LOCALBASE}/include:${LOCALBASE}/lib:expat +CONFIGURE_ARGS+= --with-expat=${LOCALBASE}/include:${LOCALBASE}/lib:expat # =============================================================== OPTIONS_SUB= yes @@ -48,8 +47,6 @@ GPG_AGENT_BUILD_DEPENDS= gpg-agent:security/gnupg GPG_AGENT_RUN_DEPENDS= gpg-agent:security/gnupg -STATIC_CONFIGURE_ON= --enable-all-static PKG_CONFIG="${LOCALBASE}/bin/pkg-config --static" - # =============================================================== .include @@ -71,16 +68,6 @@ .include -pre-everything:: -.if defined(SVN_BUILD_ADDONS) -.if ${PORT_OPTIONS:MSTATIC} || ${OPTIONS_FILE_SET:MSTATIC} - @${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" - @${ECHO_MSG} "!!! addons (bindings, mod_dav_svn, etc). and static build are not compatible !!!" - @${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" - @${FALSE} -.endif -.endif - pre-patch: .if defined(SVN_BUILD_ADDONS) @${CP} ${FILESDIR}/build-outputs.mk.addons ${WRKSRC}/build-outputs.mk diff --git a/devel/subversion/pkg-plist b/devel/subversion/pkg-plist --- a/devel/subversion/pkg-plist +++ b/devel/subversion/pkg-plist @@ -72,65 +72,65 @@ include/subversion-1/svn_x509.h include/subversion-1/svn_xml.h lib/libsvn_client-1.a -%%NO_STATIC%%lib/libsvn_client-1.so -%%NO_STATIC%%lib/libsvn_client-1.so.0 -%%NO_STATIC%%lib/libsvn_client-1.so.0.0.0 +lib/libsvn_client-1.so +lib/libsvn_client-1.so.0 +lib/libsvn_client-1.so.0.0.0 lib/libsvn_delta-1.a -%%NO_STATIC%%lib/libsvn_delta-1.so -%%NO_STATIC%%lib/libsvn_delta-1.so.0 -%%NO_STATIC%%lib/libsvn_delta-1.so.0.0.0 +lib/libsvn_delta-1.so +lib/libsvn_delta-1.so.0 +lib/libsvn_delta-1.so.0.0.0 lib/libsvn_diff-1.a -%%NO_STATIC%%lib/libsvn_diff-1.so -%%NO_STATIC%%lib/libsvn_diff-1.so.0 -%%NO_STATIC%%lib/libsvn_diff-1.so.0.0.0 +lib/libsvn_diff-1.so +lib/libsvn_diff-1.so.0 +lib/libsvn_diff-1.so.0.0.0 lib/libsvn_fs-1.a -%%NO_STATIC%%lib/libsvn_fs-1.so -%%NO_STATIC%%lib/libsvn_fs-1.so.0 -%%NO_STATIC%%lib/libsvn_fs-1.so.0.0.0 +lib/libsvn_fs-1.so +lib/libsvn_fs-1.so.0 +lib/libsvn_fs-1.so.0.0.0 %%BDB%%lib/libsvn_fs_base-1.a -%%NO_STATIC%%%%BDB%%lib/libsvn_fs_base-1.so -%%NO_STATIC%%%%BDB%%lib/libsvn_fs_base-1.so.0 -%%NO_STATIC%%%%BDB%%lib/libsvn_fs_base-1.so.0.0.0 +%%BDB%%lib/libsvn_fs_base-1.so +%%BDB%%lib/libsvn_fs_base-1.so.0 +%%BDB%%lib/libsvn_fs_base-1.so.0.0.0 lib/libsvn_fs_fs-1.a -%%NO_STATIC%%lib/libsvn_fs_fs-1.so -%%NO_STATIC%%lib/libsvn_fs_fs-1.so.0 -%%NO_STATIC%%lib/libsvn_fs_fs-1.so.0.0.0 +lib/libsvn_fs_fs-1.so +lib/libsvn_fs_fs-1.so.0 +lib/libsvn_fs_fs-1.so.0.0.0 lib/libsvn_fs_util-1.a -%%NO_STATIC%%lib/libsvn_fs_util-1.so -%%NO_STATIC%%lib/libsvn_fs_util-1.so.0 -%%NO_STATIC%%lib/libsvn_fs_util-1.so.0.0.0 +lib/libsvn_fs_util-1.so +lib/libsvn_fs_util-1.so.0 +lib/libsvn_fs_util-1.so.0.0.0 lib/libsvn_fs_x-1.a -%%NO_STATIC%%lib/libsvn_fs_x-1.so -%%NO_STATIC%%lib/libsvn_fs_x-1.so.0 -%%NO_STATIC%%lib/libsvn_fs_x-1.so.0.0.0 +lib/libsvn_fs_x-1.so +lib/libsvn_fs_x-1.so.0 +lib/libsvn_fs_x-1.so.0.0.0 lib/libsvn_ra-1.a -%%NO_STATIC%%lib/libsvn_ra-1.so -%%NO_STATIC%%lib/libsvn_ra-1.so.0 -%%NO_STATIC%%lib/libsvn_ra-1.so.0.0.0 +lib/libsvn_ra-1.so +lib/libsvn_ra-1.so.0 +lib/libsvn_ra-1.so.0.0.0 lib/libsvn_ra_local-1.a -%%NO_STATIC%%lib/libsvn_ra_local-1.so -%%NO_STATIC%%lib/libsvn_ra_local-1.so.0 -%%NO_STATIC%%lib/libsvn_ra_local-1.so.0.0.0 +lib/libsvn_ra_local-1.so +lib/libsvn_ra_local-1.so.0 +lib/libsvn_ra_local-1.so.0.0.0 %%SERF%%lib/libsvn_ra_serf-1.a -%%NO_STATIC%%%%SERF%%lib/libsvn_ra_serf-1.so -%%NO_STATIC%%%%SERF%%lib/libsvn_ra_serf-1.so.0 -%%NO_STATIC%%%%SERF%%lib/libsvn_ra_serf-1.so.0.0.0 +%%SERF%%lib/libsvn_ra_serf-1.so +%%SERF%%lib/libsvn_ra_serf-1.so.0 +%%SERF%%lib/libsvn_ra_serf-1.so.0.0.0 lib/libsvn_ra_svn-1.a -%%NO_STATIC%%lib/libsvn_ra_svn-1.so -%%NO_STATIC%%lib/libsvn_ra_svn-1.so.0 -%%NO_STATIC%%lib/libsvn_ra_svn-1.so.0.0.0 +lib/libsvn_ra_svn-1.so +lib/libsvn_ra_svn-1.so.0 +lib/libsvn_ra_svn-1.so.0.0.0 lib/libsvn_repos-1.a -%%NO_STATIC%%lib/libsvn_repos-1.so -%%NO_STATIC%%lib/libsvn_repos-1.so.0 -%%NO_STATIC%%lib/libsvn_repos-1.so.0.0.0 +lib/libsvn_repos-1.so +lib/libsvn_repos-1.so.0 +lib/libsvn_repos-1.so.0.0.0 lib/libsvn_subr-1.a -%%NO_STATIC%%lib/libsvn_subr-1.so -%%NO_STATIC%%lib/libsvn_subr-1.so.0 -%%NO_STATIC%%lib/libsvn_subr-1.so.0.0.0 +lib/libsvn_subr-1.so +lib/libsvn_subr-1.so.0 +lib/libsvn_subr-1.so.0.0.0 lib/libsvn_wc-1.a -%%NO_STATIC%%lib/libsvn_wc-1.so -%%NO_STATIC%%lib/libsvn_wc-1.so.0 -%%NO_STATIC%%lib/libsvn_wc-1.so.0.0.0 +lib/libsvn_wc-1.so +lib/libsvn_wc-1.so.0 +lib/libsvn_wc-1.so.0.0.0 libdata/pkgconfig/libsvn_client.pc libdata/pkgconfig/libsvn_delta.pc libdata/pkgconfig/libsvn_diff.pc