diff --git a/Mk/Uses/autoreconf.mk b/Mk/Uses/autoreconf.mk index 7d639d7e89af..67ee8c824455 100644 --- a/Mk/Uses/autoreconf.mk +++ b/Mk/Uses/autoreconf.mk @@ -1,135 +1,136 @@ # Run autoreconf in AUTORECONF_WRKSRC to update configure, Makefile.in and # other build scripts. # # Autoreconf runs the following commands provided by devel/autoconf and # devel/automake. Each command applies to a single configure.ac or # configure.in (old name). If configure.ac defines subdirectories with their # own configure.ac (using AC_CONFIG_SUBDIRS), autoreconf will recursively # update those as well. # # aclocal Looks up definitions of m4 macros used in configure.ac that are # not provided by autoconf and copies them from their source *.m4 # file to aclocal.m4. Local *.m4 files included with the source # code take precedence over systemwide *.m4 files. # autoconf Generates configure from configure.ac using macro definitions # provided by autoconf itself and aclocal.m4. # autoheader Generates a configuration header (typically config.h.in) from # configure.ac and the macro definitions in aclocal.m4. Run by # autoreconf if configure.ac (or one of the macros it uses) # contains AC_CONFIG_HEADERS, AC_CONFIG_HEADER (undocumented), or # AM_CONFIG_HEADER (obsolete). # automake Generates Makefile.in from Makefile.am for each Makefile # listed in configure.ac (using AC_CONFIG_FILES). Also updates # build scripts like compile, depcomp, install-sh, ylwrap,... # Run by autoreconf if configure.ac (or one of the macros it # uses) contains AM_INIT_AUTOMAKE. # # Autoreconf may also run these additional commands provided by other ports. # A port needs to have a build depdendency on these ports when that's the case. # # autopoint Provided by devel/gettext-tools. Updates gettext related *.m4 # files included with the source code and build scripts such as # config.rpath. Run by autoreconf if configure.ac (or one of the # macros it uses) contains AM_GNU_GETTEXT. A build dependency on # devel/gettext-tools can be added with USES+=gettext-tools. # Note that autoreconf runs autopoint even if a port has an NLS # option and the option is disabled. The build dependency on # gettext-tools is not optional. If the run dependency on # gettext is optional this can be specified with # NLS_USES=gettext-runtime. # gtkdocize Provided by textproc/gtk-doc. Updates gtk-doc related *.m4 # files included with the source code and build scripts such as # gtk-doc.make. Run by autoreconf if configure.ac contains # GTK_DOC_CHECK. The build dependency can be made optional with # DOCS option and DOCS_BUILD_DEPENDS+=gtkdocize:textproc/gtk-doc # on condition that you remove GTK_DOC_CHECK from configure.ac, # for instance using a post-patch-DOCS-off target with the # following command: # @${REINPLACE_CMD} /^GTK_DOC_CHECK/d ${WRKSRC}/configure.ac # It is likely that more patching is needed to eliminate or avoid # use of gtk-doc. # intltoolize Provided by textproc/intltool. Updates intltool related *.m4 # files included with the source code and build scripts such as # po/Makefile.in.in. Run by autoreconf if configure.ac contains # (AC|IT)_PROG_INTLTOOL. A build dependency on textproc/intltool # can be added with USES+=gnome and USE_GNOME+=intltool. # libtoolize Provided by devel/libtool. Updates libtool related *.m4 files # included with the source code and build scripts such as # ltmain.sh. Run by autoreconf if configure.ac (or one of the # macros it uses) contains AC_PROG_LIBTOOL or LT_INIT. A build # dependency on devel/libtool is added implicitly when USES # contains both autoreconf and libtool. # # Feature: autoreconf # Usage: USES=autoreconf or USES=autoreconf:args # Valid args: build Don't run autoreconf, only add build dependencies # 2.69 Use this legacy version # # Port maintainers can set the following variable: # # AUTORECONF_ARGS The string to pass to autoreconf in addition to # the default "-f -i" # # MAINTAINER: ports@FreeBSD.org .if !defined(_INCLUDE_USES_AUTORECONF_MK) _INCLUDE_USES_AUTORECONF_MK= yes _USES_POST+= autoreconf AUTORECONF?= ${LOCALBASE}/bin/autoreconf${_AUTORECONF} AUTORECONF_WRKSRC?= ${WRKSRC} .endif .if defined(_POSTMKINCLUDED) && !defined(_INCLUDE_USES_AUTORECONF_POST_MK) _INCLUDE_USES_AUTORECONF_POST_MK= yes . if ${autoreconf_ARGS:M2.69} _AUTORECONF= 2.69 BUILD_DEPENDS+= autoconf2.69>=2.69:devel/autoconf2.69 . else -_AUTORECONF= 2.71 -BUILD_DEPENDS+= autoconf>=2.71:devel/autoconf +_AUTORECONF= 2.72 +BUILD_DEPENDS+= autoconf>=${_AUTORECONF}:devel/autoconf . endif BUILD_DEPENDS+= automake>=1.16.5:devel/automake . if defined(libtool_ARGS) && empty(libtool_ARGS:Mbuild) BUILD_DEPENDS+= libtoolize:devel/libtool . endif # In case autoconf-switch wrapper scripts are used during build. CONFIGURE_ENV+= DEFAULT_AUTOCONF=${_AUTORECONF} MAKE_ENV+= DEFAULT_AUTOCONF=${_AUTORECONF} +WRK_ENV+= DEFAULT_AUTOCONF=${_AUTORECONF} . if ${autoreconf_ARGS:Nbuild:N2.69} IGNORE= incorrect 'USES+=autoreconf:${autoreconf_ARGS}'\ expecting 'USES+=autoreconf[:build,2.69]' . endif . if ! ${autoreconf_ARGS:Mbuild} _USES_configure+= 470:do-autoreconf do-autoreconf: . for f in AUTHORS ChangeLog INSTALL NEWS README # Don't modify time stamps if the files already exist @test -e ${AUTORECONF_WRKSRC}/${f} || ${TOUCH} ${AUTORECONF_WRKSRC}/${f} . endfor . if ${_AUTORECONF} == 2.69 @(cd ${AUTORECONF_WRKSRC} && \ if test -f configure.ac; then configure=configure.ac; \ else configure=configure.in; fi && \ if ${GREP} -q '^GTK_DOC_CHECK' $${configure}; \ then if ! ${LOCALBASE}/bin/gtkdocize --copy; then \ ${ECHO_MSG} '===> Mk/Uses/autoreconf.mk: Error running gtkdocize'; \ ${FALSE}; fi; fi && \ if ${EGREP} -q '^(AC|IT)_PROG_INTLTOOL' $${configure}; \ then if ! ${LOCALBASE}/bin/intltoolize -f -c; then \ ${ECHO_MSG} '===> Mk/Uses/autoreconf.mk: Error running intltoolize'; \ ${FALSE}; fi; fi) . endif @(cd ${AUTORECONF_WRKSRC} && if ! ${AUTORECONF} -f -i ${AUTORECONF_ARGS}; then \ ${ECHO_MSG} '===> Mk/Uses/autoreconf.mk: Error running ${AUTORECONF}'; \ ${FALSE}; fi) . endif .endif diff --git a/archivers/lha-ac/files/patch-configure.ac b/archivers/lha-ac/files/patch-configure.ac new file mode 100644 index 000000000000..9b99a39bd9b4 --- /dev/null +++ b/archivers/lha-ac/files/patch-configure.ac @@ -0,0 +1,10 @@ +--- configure.ac.orig 2021-11-25 09:41:46 UTC ++++ configure.ac +@@ -11,6 +11,7 @@ AC_DEFINE_UNQUOTED(PLATFORM, "$ac_cv_host", + [the type of system on which the package will run.]) + + # Checks for programs. ++AC_PROG_CPP + AC_PROG_CC + AC_PROG_GCC_TRADITIONAL + AC_PROG_INSTALL diff --git a/devel/autoconf/Makefile b/devel/autoconf/Makefile index 98b40b384c9f..6ccff1dac878 100644 --- a/devel/autoconf/Makefile +++ b/devel/autoconf/Makefile @@ -1,73 +1,73 @@ PORTNAME= autoconf -PORTVERSION= 2.71 -PORTREVISION= 1 +DISTVERSION= 2.72 CATEGORIES= devel MASTER_SITES= GNU MAINTAINER= tijl@FreeBSD.org COMMENT= Generate configure scripts and related files WWW= https://www.gnu.org/software/autoconf/ LICENSE= EXCEPTION GFDL GPLv2+ GPLv3+ LICENSE_COMB= multi LICENSE_NAME_EXCEPTION= AUTOCONF CONFIGURE SCRIPT EXCEPTION LICENSE_FILE_EXCEPTION= ${WRKSRC}/COPYING.EXCEPTION LICENSE_FILE_GFDL= ${WRKSRC}/doc/fdl.texi LICENSE_FILE_GPLv2+ = ${WRKSRC}/COPYING LICENSE_FILE_GPLv3+ = ${WRKSRC}/COPYINGv3 LICENSE_PERMS_EXCEPTION=dist-mirror dist-sell pkg-mirror pkg-sell auto-accept BUILD_DEPENDS= gm4:devel/m4 RUN_DEPENDS= autoconf-switch>=0:devel/autoconf-switch \ gm4:devel/m4 -VERSION= 2.71 USES= perl5 tar:xz +VERSION= ${DISTVERSION} + GNU_CONFIGURE= yes GNU_CONFIGURE_MANPREFIX=${PREFIX}/share CONFIGURE_ARGS= --program-suffix=${VERSION} \ --without-lispdir CONFIGURE_ENV= AWK=${AWK} \ EMACS=no \ M4=${LOCALBASE}/bin/gm4 DATADIR= ${PREFIX}/share/autoconf${VERSION} NO_ARCH= yes PLIST_SUB= VERSION=${VERSION} OPTIONS_DEFINE= INFO OPTIONS_DEFAULT=INFO INFO_USES= makeinfo INFO_INFO= autoconf${VERSION} post-patch: @${REINPLACE_CMD} '/^pkgdatadir =/s/@PACKAGE@/&@VERSION@/' \ ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -E \ -e 's/[^-/]auto(conf|header|reconf|scan|update)/&${VERSION}/g' \ -e 's/ifnames/&${VERSION}/g' \ -e '/config\.(guess|sub)/d' \ ${WRKSRC}/man/*.1 post-patch-INFO-on: @${REINPLACE_CMD} -E 's/autoconf\.(info|texi)/autoconf${VERSION}.\1/g' \ ${WRKSRC}/Makefile.in @${CP} ${WRKSRC}/doc/autoconf.texi ${WRKSRC}/doc/autoconf${VERSION}.texi @${REINPLACE_CMD} \ -e 's/autoconf\.info/autoconf${VERSION}.info/' \ -e '/^@direntry/,/^@end/ { \ s/^\*[^-:]*/&${VERSION}/ ; \ s/(autoconf)/(autoconf${VERSION})/ ; \ s/ \{2,9\}/ / ; }' \ ${WRKSRC}/doc/autoconf${VERSION}.texi # Restore timestamp in .info file. @${TOUCH} -r ${WRKSRC}/doc/autoconf${VERSION}.texi.bak \ ${WRKSRC}/doc/autoconf${VERSION}.texi post-patch-INFO-off: @${REINPLACE_CMD} '/^INFO_DEPS =/d' ${WRKSRC}/Makefile.in .include diff --git a/devel/autoconf/distinfo b/devel/autoconf/distinfo index 8505f71992dc..360c958bc9bb 100644 --- a/devel/autoconf/distinfo +++ b/devel/autoconf/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1651493393 -SHA256 (autoconf-2.71.tar.xz) = f14c83cfebcc9427f2c3cea7258bd90df972d92eb26752da4ddad81c87a0faa4 -SIZE (autoconf-2.71.tar.xz) = 1292296 +TIMESTAMP = 1709723659 +SHA256 (autoconf-2.72.tar.xz) = ba885c1319578d6c94d46e9b0dceb4014caafe2490e437a0dbca3f270a223f5a +SIZE (autoconf-2.72.tar.xz) = 1389680 diff --git a/devel/autoconf/pkg-plist b/devel/autoconf/pkg-plist index bbd3fdaf4174..984069562fbe 100644 --- a/devel/autoconf/pkg-plist +++ b/devel/autoconf/pkg-plist @@ -1,61 +1,61 @@ bin/autoconf%%VERSION%% bin/autoheader%%VERSION%% bin/autom4te%%VERSION%% bin/autoreconf%%VERSION%% bin/autoscan%%VERSION%% bin/autoupdate%%VERSION%% bin/ifnames%%VERSION%% share/man/man1/autoconf%%VERSION%%.1.gz share/man/man1/autoheader%%VERSION%%.1.gz share/man/man1/autom4te%%VERSION%%.1.gz share/man/man1/autoreconf%%VERSION%%.1.gz share/man/man1/autoscan%%VERSION%%.1.gz share/man/man1/autoupdate%%VERSION%%.1.gz share/man/man1/ifnames%%VERSION%%.1.gz %%DATADIR%%/Autom4te/C4che.pm %%DATADIR%%/Autom4te/ChannelDefs.pm %%DATADIR%%/Autom4te/Channels.pm %%DATADIR%%/Autom4te/Config.pm %%DATADIR%%/Autom4te/Configure_ac.pm %%DATADIR%%/Autom4te/FileUtils.pm %%DATADIR%%/Autom4te/General.pm %%DATADIR%%/Autom4te/Getopt.pm %%DATADIR%%/Autom4te/Request.pm %%DATADIR%%/Autom4te/XFile.pm %%DATADIR%%/INSTALL %%DATADIR%%/autoconf/autoconf.m4 %%DATADIR%%/autoconf/autoconf.m4f %%DATADIR%%/autoconf/autoheader.m4 %%DATADIR%%/autoconf/autoscan.m4 %%DATADIR%%/autoconf/autotest.m4 %%DATADIR%%/autoconf/autoupdate.m4 %%DATADIR%%/autoconf/c.m4 %%DATADIR%%/autoconf/erlang.m4 %%DATADIR%%/autoconf/fortran.m4 %%DATADIR%%/autoconf/functions.m4 %%DATADIR%%/autoconf/general.m4 %%DATADIR%%/autoconf/go.m4 %%DATADIR%%/autoconf/headers.m4 %%DATADIR%%/autoconf/lang.m4 %%DATADIR%%/autoconf/libs.m4 %%DATADIR%%/autoconf/oldnames.m4 %%DATADIR%%/autoconf/programs.m4 %%DATADIR%%/autoconf/specific.m4 %%DATADIR%%/autoconf/status.m4 %%DATADIR%%/autoconf/trailer.m4 %%DATADIR%%/autoconf/types.m4 %%DATADIR%%/autom4te.cfg %%DATADIR%%/autoscan/autoscan.list %%DATADIR%%/autotest/autotest.m4 %%DATADIR%%/autotest/autotest.m4f %%DATADIR%%/autotest/general.m4 %%DATADIR%%/autotest/specific.m4 %%DATADIR%%/build-aux/config.guess %%DATADIR%%/build-aux/config.sub %%DATADIR%%/build-aux/install-sh %%DATADIR%%/m4sugar/foreach.m4 %%DATADIR%%/m4sugar/m4sh.m4 %%DATADIR%%/m4sugar/m4sh.m4f %%DATADIR%%/m4sugar/m4sugar.m4 %%DATADIR%%/m4sugar/m4sugar.m4f -%%DATADIR%%/m4sugar/version.m4 +%%DATADIR%%/version.m4 diff --git a/mail/mu/files/patch-configure.ac b/mail/mu/files/patch-configure.ac new file mode 100644 index 000000000000..19771e805d8c --- /dev/null +++ b/mail/mu/files/patch-configure.ac @@ -0,0 +1,18 @@ +--- configure.ac.orig 2022-12-06 08:23:41 UTC ++++ configure.ac +@@ -134,13 +134,13 @@ PKG_PROG_PKG_CONFIG(0.28) # latest version in buildroo + m4_ifndef([PKG_PROG_PKG_CONFIG], + [m4_fatal([please install pkg-config >= 0.28 before running autoconf/autogen])]) + PKG_PROG_PKG_CONFIG(0.28) # latest version in buildroot +-AS_IF([test -z "$PKG_CONFIG"], ++AS_IF([test -z "$PKG_CONFIG"],[ + AC_MSG_ERROR([ + *** pkg-config with version >= 0.28 could not be found. + *** + *** Make sure it is in your path, or set the PKG_CONFIG environment variable + *** to the full path to pkg-config.]) +-) ++]) + + # glib2? + PKG_CHECK_MODULES(GLIB,glib-2.0 >= 2.58 gobject-2.0 gio-2.0) diff --git a/mail/mu4e/Makefile b/mail/mu4e/Makefile index 75b3ca25a961..d32e1f4eccdc 100644 --- a/mail/mu4e/Makefile +++ b/mail/mu4e/Makefile @@ -1,50 +1,50 @@ PORTNAME= mu4e PORTVERSION= 1.8.13 PORTREVISION= 7 DISTVERSIONPREFIX= v CATEGORIES= mail PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} MAINTAINER= hrs@FreeBSD.org COMMENT= Emacs frontend for Mu WWW= https://www.djcbsoftware.nl/code/mu/ LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING RUN_DEPENDS= mu:mail/mu USES= autoreconf emacs makeinfo pkgconfig USE_GITHUB= yes GH_PROJECT= mu GH_ACCOUNT= djcb GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-guile \ --disable-readline \ --docdir="${DOCSDIR}" \ --enable-mu4e INFO= ${PORTNAME} BUILD_WRKSRC= ${WRKSRC}/${PORTNAME} INSTALL_WRKSRC= ${WRKSRC}/${PORTNAME} INSTALL_TARGET= install-strip MAKE_JOBS_UNSAFE= yes OPTIONS_DEFINE= DOCS OPTIONS_SUB= yes post-extract: ${INSTALL_DATA} ${WRKSRC}/mu4e/obsolete/org-mu4e.el \ ${WRKSRC}/mu4e/org-mu4e.el -pre-build: +post-configure: ${REINPLACE_CMD} -e '/.el.elc/,/^$$/d' ${BUILD_WRKSRC}/Makefile && \ ${ECHO_CMD} '.include "${FILESDIR}/byte-compile.mk"' \ >> ${BUILD_WRKSRC}/Makefile post-install: cd ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/mu4e && \ ${GZIP_CMD} *.el .include diff --git a/mail/mu4e/files/patch-configure.ac b/mail/mu4e/files/patch-configure.ac index 2a4aa63073f4..55d9363fc128 100644 --- a/mail/mu4e/files/patch-configure.ac +++ b/mail/mu4e/files/patch-configure.ac @@ -1,122 +1,133 @@ --- configure.ac.orig 2022-12-06 08:23:41 UTC +++ configure.ac @@ -34,11 +34,11 @@ AC_SUBST(prefix) # AC_PROG_CXX *before* AC_PROG_CC, otherwise configure won't error out # when a c++ compiler is not found. Weird, huh? -AC_PROG_CXX -AC_PROG_CC -AC_PROG_CPP +#AC_PROG_CXX +#AC_PROG_CC +#AC_PROG_CPP AC_PROG_INSTALL -AC_CHECK_INCLUDES_DEFAULT +#AC_CHECK_INCLUDES_DEFAULT AC_PROG_EGREP @@ -49,22 +49,22 @@ extra_flags="-Wformat-security \ -Wno-bad-function-cast \ -Wno-switch-enum" -AX_CXX_COMPILE_STDCXX_17 -AX_COMPILER_FLAGS_CXXFLAGS([],[],[${extra_cflags}]) -AX_APPEND_COMPILE_FLAGS([-Wno-inline],[CXXFLAGS]) -AX_VALGRIND_CHECK +#AX_CXX_COMPILE_STDCXX_17 +#AX_COMPILER_FLAGS_CXXFLAGS([],[],[${extra_cflags}]) +#AX_APPEND_COMPILE_FLAGS([-Wno-inline],[CXXFLAGS]) +#AX_VALGRIND_CHECK -LT_INIT +#LT_INIT AX_CODE_COVERAGE AC_PROG_AWK AC_CHECK_PROG(SORT,sort,sort) -AC_CHECK_HEADERS([wordexp.h]) +#AC_CHECK_HEADERS([wordexp.h]) # use the 64-bit versions -AC_SYS_LARGEFILE +#AC_SYS_LARGEFILE # asan is somewhat similar to valgrind, but has low enough overhead so it # can be used during normal operation. -@@ -143,43 +143,13 @@ AS_IF([test -z "$PKG_CONFIG"], - ) +@@ -134,52 +134,22 @@ PKG_PROG_PKG_CONFIG(0.28) # latest version in buildroo + m4_ifndef([PKG_PROG_PKG_CONFIG], + [m4_fatal([please install pkg-config >= 0.28 before running autoconf/autogen])]) + PKG_PROG_PKG_CONFIG(0.28) # latest version in buildroot +-AS_IF([test -z "$PKG_CONFIG"], ++AS_IF([test -z "$PKG_CONFIG"],[ + AC_MSG_ERROR([ + *** pkg-config with version >= 0.28 could not be found. + *** + *** Make sure it is in your path, or set the PKG_CONFIG environment variable + *** to the full path to pkg-config.]) +-) ++]) # glib2? -PKG_CHECK_MODULES(GLIB,glib-2.0 >= 2.58 gobject-2.0 gio-2.0) -glib_version="$($PKG_CONFIG --modversion glib-2.0)" +# PKG_CHECK_MODULES(GLIB,glib-2.0 >= 2.58 gobject-2.0 gio-2.0) +# glib_version="$($PKG_CONFIG --modversion glib-2.0)" # gmime, version 3.0 or higher -PKG_CHECK_MODULES(GMIME,gmime-3.0) -gmime_version="$($PKG_CONFIG --modversion gmime-3.0)" +# PKG_CHECK_MODULES(GMIME,gmime-3.0) +# gmime_version="$($PKG_CONFIG --modversion gmime-3.0)" -# xapian checking - we need 1.4 at least -PKG_CHECK_MODULES(XAPIAN,xapian-core >= 1.4,[ - have_xapian=yes - xapian_version=$($PKG_CONFIG xapian-core --modversion) - AC_SUBST(XAPIAN_CXXFLAGS,${XAPIAN_CFLAGS}) -],[ - # fall back to the xapian-config script. Not sure if there are cases where the - # pkgconfig does not work, but xapian-config does, so keep this for now. - AC_MSG_NOTICE([falling back to xapian-config]) - AC_CHECK_PROG(XAPIAN_CONFIG,xapian-config,xapian-config,no) - AS_IF([test "x$XAPIAN_CONFIG" = "xno"],[ - AC_MSG_ERROR([ - *** xapian could not be found; please install it - *** e.g., in debian/ubuntu the package would be 'libxapian-dev' - *** If you compiled it yourself, you should ensure that xapian-config - *** is in your PATH.])], - [xapian_version=$($XAPIAN_CONFIG --version | sed -e 's/.* //')]) - - AS_CASE([$xapian_version], - [1.[[4-9]].[[0-9]]*], - [AC_MSG_NOTICE([xapian $xapian_version found.])], - [AC_MSG_ERROR([*** xapian version >= 1.4 needed, but version $xapian_version found.])]) - - XAPIAN_CXXFLAGS="$($XAPIAN_CONFIG --cxxflags)" - XAPIAN_LIBS="$($XAPIAN_CONFIG --libs)" - have_xapian="yes" - - AC_SUBST(XAPIAN_CXXFLAGS) - AC_SUBST(XAPIAN_LIBS) -]) ############################################################################### # we set the set the version of the MuStore (Xapian database) layout # here; it will become part of the db name, so we can automatically -@@ -247,24 +217,10 @@ AC_SUBST(MU_DOC_DIR, "${prefix}/share/doc/mu") +@@ -247,24 +217,10 @@ Makefile AC_CONFIG_FILES([ Makefile -mu/Makefile -lib/Makefile -lib/doxyfile -lib/thirdparty/Makefile -lib/utils/Makefile -lib/message/Makefile -lib/index/Makefile mu4e/Makefile mu4e/mu4e-config.el -guile/Makefile -guile/mu/Makefile -guile/examples/Makefile -guile/scripts/Makefile -man/Makefile -m4/Makefile -contrib/Makefile ]) -AC_CONFIG_FILES([mu/mu-memcheck], [chmod +x mu/mu-memcheck]) +# AC_CONFIG_FILES([mu/mu-memcheck], [chmod +x mu/mu-memcheck]) AC_OUTPUT diff --git a/multimedia/bino/files/patch-configure.ac b/multimedia/bino/files/patch-configure.ac new file mode 100644 index 000000000000..d2f69620b3c0 --- /dev/null +++ b/multimedia/bino/files/patch-configure.ac @@ -0,0 +1,10 @@ +--- configure.ac.orig 2016-12-16 08:05:02 UTC ++++ configure.ac +@@ -35,6 +35,7 @@ AC_PROG_CXX + AM_INIT_AUTOMAKE([1.11.1 color-tests silent-rules tar-pax no-texinfo.tex -Wall -Wno-portability]) + AM_SILENT_RULES([yes]) + AC_PROG_CXX ++AC_PROG_GREP + AC_PROG_INSTALL + AC_PROG_RANLIB + AC_PROG_LN_S diff --git a/net/rsync/Makefile b/net/rsync/Makefile index 70e7c0cf3a63..07083879f67f 100644 --- a/net/rsync/Makefile +++ b/net/rsync/Makefile @@ -1,107 +1,110 @@ PORTNAME= rsync DISTVERSION= 3.2.7 PORTREVISION= 1 CATEGORIES= net MASTER_SITES= https://www.mirrorservice.org/sites/rsync.samba.org/src/ \ http://rsync.mirror.garr.it/src/ \ http://www.mirrorservice.org/sites/rsync.samba.org/src/ \ https://download.samba.org/pub/rsync/src/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= rodrigo@FreeBSD.org COMMENT= Network file distribution/synchronization utility WWW= https://rsync.samba.org/ LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= liblz4.so:archivers/liblz4 \ libxxhash.so:devel/xxhash \ libzstd.so:archivers/zstd -USES= cpe python shebangfix ssl autoreconf +USES= autoreconf:build cpe python shebangfix ssl PYTHON_NO_DEPENDS= yes CPE_VENDOR= samba CPE_PRODUCT= rsync USE_RC_SUBR= rsyncd SHEBANG_FILES= support/rrsync GNU_CONFIGURE= yes GNU_CONFIGURE_MANPREFIX=${PREFIX}/share CONFIGURE_ARGS= --disable-debug \ --enable-ipv6 \ --with-rsyncd-conf=${ETCDIR}/rsyncd.conf INSTALL_TARGET= install-strip TEST_TARGET= check CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib PATCH_STRIP= -p1 SUB_LIST= NAME=rsyncd PORTDOCS= NEWS.md README.md csprotocol.txt tech_report.tex # define options OPTIONS_DEFINE= DOCS ICONV POPT_PORT SSH ZLIB_BASE OPTIONS_DEFAULT= FLAGS ICONV SSH ZLIB_BASE OPTIONS_RADIO= PTS OPTIONS_RADIO_PTS= FLAGS RENAMED # options provided upstream FLAGS_DESC= File system flags support patch, adds --fileflags POPT_PORT_DESC= Use popt from devel/popt instead of bundled one SSH_DESC= Use SSH instead of RSH ZLIB_BASE_DESC= Use zlib from base instead of bundled one # options provided by patch (mutually exclusive) PTS_DESC= Functionality provided by third party patches RENAMED_DESC= Add support for renamed file detection FLAGS_EXTRA_PATCHES= ${WRKSRC}/patches/fileflags.diff \ ${FILESDIR}/extrapatch-main.c ICONV_USES= iconv:translit ICONV_CONFIGURE_ENABLE= iconv iconv-open POPT_PORT_LIB_DEPENDS= libpopt.so:devel/popt POPT_PORT_CONFIGURE_OFF= --with-included-popt RENAMED_EXTRA_PATCHES= ${WRKSRC}/patches/detect-renamed.diff SSH_CONFIGURE_ON= --with-rsh=ssh SSH_CONFIGURE_OFF= --with-rsh=rsh ZLIB_BASE_CONFIGURE_ON= --with-included-zlib=no .include .if make(makesum) || ${PORT_OPTIONS:MRENAMED} || ${PORT_OPTIONS:MICONV} || ${PORT_OPTIONS:MFLAGS} DISTFILES+= ${PORTNAME}-patches-${DISTVERSION}${EXTRACT_SUFX} .endif .include .if empty(ICONV_LIB) || !${PORT_OPTIONS:MICONV} CONFIGURE_ARGS+= ac_cv_search_libiconv_open=no .endif post-patch: @${REINPLACE_CMD} -e 's:/etc/r{1,2}sync:${ETCDIR}/:g' \ -e 's:/etc/letsencrypt:${PREFIX}/etc/letsencrypt:g' \ ${WRKSRC}/rsync.1 ${WRKSRC}/rsyncd.conf.5 @${REINPLACE_CMD} -e 's|/usr/bin/rsync|${PREFIX}/bin/rsync|g' ${WRKSRC}/support/rrsync +pre-configure: + @(cd ${WRKSRC} && ${SETENVI} ${WRK_ENV} ${MAKE_CMD} -f prepare-source.mak) + post-install: @${MKDIR} ${STAGEDIR}${ETCDIR} ${INSTALL_DATA} ${FILESDIR}/rsyncd.conf.sample ${STAGEDIR}${ETCDIR}/ ${INSTALL_SCRIPT} ${WRKSRC}/support/rrsync ${STAGEDIR}${PREFIX}/sbin ${INSTALL_MAN} ${WRKSRC}/rrsync.1 ${STAGEDIR}${PREFIX}/share/man/man1/ post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} .include