Date: Thu, 26 May 2022 06:21:20 GMT From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 52eb14cdecd2 - main - sysutils/fusefs-ntfs: clean the port up before functional changes Message-ID: <202205260621.24Q6LKhV042129@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=52eb14cdecd2ac9688c8e30c7a0a3166992a2c1b commit 52eb14cdecd2ac9688c8e30c7a0a3166992a2c1b Author: Alexey Dokuchaev <danfe@FreeBSD.org> AuthorDate: 2022-05-26 06:20:16 +0000 Commit: Alexey Dokuchaev <danfe@FreeBSD.org> CommitDate: 2022-05-26 06:20:16 +0000 sysutils/fusefs-ntfs: clean the port up before functional changes - Drop needless CPPFLAGS, the build system already knows where to find its bits and pieces by itself - Replace hand-rolled stripping in the `post-install' target with appropriate INSTALL_TARGET - In the configure script, treat FreeBSD as first-class operating system and adhere to --with-fuse switch (which we already pass) - Drop the mount helper-related patch hunk so to not confuse the reader as we also pass it on the CONFIGURE_ARGS explicitly --- sysutils/fusefs-ntfs/Makefile | 5 +---- sysutils/fusefs-ntfs/files/patch-configure | 29 +++++++++++++++-------------- 2 files changed, 16 insertions(+), 18 deletions(-) diff --git a/sysutils/fusefs-ntfs/Makefile b/sysutils/fusefs-ntfs/Makefile index 5338d110ac16..d029b406c992 100644 --- a/sysutils/fusefs-ntfs/Makefile +++ b/sysutils/fusefs-ntfs/Makefile @@ -20,7 +20,7 @@ USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --exec-prefix=${PREFIX} --disable-mount-helper \ --disable-mtab --with-fuse=external --disable-ldconfig -CPPFLAGS+= -I${WRKSRC}/include/ntfs-3g/ +INSTALL_TARGET= install-strip OPTIONS_DEFINE= LOCK UBLIO DOCS OPTIONS_DEFAULT=LOCK UBLIO @@ -42,9 +42,6 @@ post-patch: @${REINPLACE_CMD} -e 's|\($$(AM_CFLAGS)\) \(-I$$(top_srcdir)/include/ntfs-3g\)|\2 \1|; \ /install-exec-hook:/,/^$$/ s|^@.*||' ${WRKSRC}/libntfs-3g/Makefile.in -post-install: - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libntfs-3g.so - post-install-DOCS-on: ${INSTALL_DATA} ${FILESDIR}/README.FreeBSD ${STAGEDIR}${DOCSDIR}/ diff --git a/sysutils/fusefs-ntfs/files/patch-configure b/sysutils/fusefs-ntfs/files/patch-configure index c68919755849..cee7cc4a9090 100644 --- a/sysutils/fusefs-ntfs/files/patch-configure +++ b/sysutils/fusefs-ntfs/files/patch-configure @@ -1,24 +1,25 @@ ---- configure.orig 2015-03-14 14:10:24 UTC +--- configure.orig 2017-03-23 09:42:56 UTC +++ configure -@@ -3256,7 +3256,7 @@ if test "${enable_mount_helper+set}" = s - else +@@ -12871,7 +12871,7 @@ $as_echo_n "checking fuse compatibility... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking fuse compatibility" >&5 + $as_echo_n "checking fuse compatibility... " >&6; } + case "${target_os}" in +- linux*|solaris*) ++ freebsd*|linux*|solaris*) - case "${target_os}" in -- linux*) enable_mount_helper="yes" ;; -+ linux*|freebsd*) enable_mount_helper="yes" ;; - *) enable_mount_helper="no" ;; - esac - -@@ -12871,7 +12871,7 @@ fi + # Check whether --with-fuse was given. + if test "${with_fuse+set}" = set; then : +@@ -12885,9 +12885,6 @@ fi + darwin*|netbsd*|kfreebsd*-gnu) with_fuse="external" ;; - freebsd*) +- freebsd*) - as_fn_error $? "Please see FreeBSD support at http://www.freshports.org/sysutils/fusefs-ntfs" "$LINENO" 5 -+ with_fuse="external" - ;; +- ;; *) as_fn_error $? "ntfs-3g can be built for Linux, FreeBSD, Mac OS X, NetBSD, and Solaris only." "$LINENO" 5 -@@ -15014,7 +15014,7 @@ if test "x${DISTCHECK_HACK}" != "x"; the + ;; +@@ -15177,7 +15174,7 @@ fi fi # Settings
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202205260621.24Q6LKhV042129>