4 files changed, 28 insertions, 16 deletions

diff --git a/sysutils/e2fsprogs/Makefile b/sysutils/e2fsprogs/Makefile
index a3bfcae3cda9..d60b8d70f264 100644
--- a/sysutils/e2fsprogs/Makefile
+++ b/sysutils/e2fsprogs/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	e2fsprogs
-PORTVERSION=	1.41.3
+PORTVERSION=	1.41.4
 PORTREVISION?=	0
 CATEGORIES?=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
@@ -51,9 +51,11 @@ PKGDEINSTALL=	${PKGINSTALL}
 .if defined(WITHOUT_NLS)
 CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB=	NLS="@comment "
+libintl=
 .else
 USE_GETTEXT=	yes
 PLIST_SUB=	NLS=""
+libintl=	"${LOCALBASE}/lib/libintl.a ${LOCALBASE}/lib/libiconv.a"
 .endif
 
 .if ${ARCH} == "sparc64"
@@ -77,7 +79,7 @@ post-build:
 		&& ${GMAKE} e2fsck \
 		STATIC_LIBS="../lib/libext2fs.a ../lib/libcom_err.a \
 		../lib/libblkid.a  ../lib/libuuid.a" \
-		LIBINTL="${LOCALBASE}/lib/libintl.a ${LOCALBASE}/lib/libiconv.a"
+		LIBINTL=${libintl}
 # Regression check: avoid a port (not upstream!) regression from 1.40.5,
 # check that e2fsck isn't dynalinked against anything but libc.so:
 	@${ECHO_CMD} -n "===>  checking that e2fsck depends on no shared objects beyond libc.so: "
@@ -108,11 +110,6 @@ post-build:
 
 post-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/fsck_ext2fs ${PREFIX}/sbin/
-	@: # stuff into /sbin since we might need e2fsck early on
-	${LN} ${PREFIX}/sbin/fsck_ext2fs /sbin/ 2>/dev/null || \
-		${INSTALL_PROGRAM} ${PREFIX}/sbin/fsck_ext2fs /sbin/
-	${LN} ${PREFIX}/sbin/e2fsck /sbin/ 2>/dev/null || \
-		${INSTALL_PROGRAM} ${PREFIX}/sbin/e2fsck /sbin/
 	${INSTALL_MAN} ${FILESDIR}/fsck_ext2fs.8 ${PREFIX}/man/man8/
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
@@ -122,8 +119,7 @@ post-install:
 .endif
 	PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 	@${ECHO_MSG} ; ${CAT} ${PKGMESSAGE} ; ${ECHO_MSG}
-
-# .if ${MASTERDIR} == ${.CURDIR}
+# the next line closes .if ${MASTERDIR} == ${.CURDIR}
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/sysutils/e2fsprogs/distinfo b/sysutils/e2fsprogs/distinfo
index 295d81a55d99..d3d86680607d 100644
--- a/sysutils/e2fsprogs/distinfo
+++ b/sysutils/e2fsprogs/distinfo
@@ -1,3 +1,3 @@
-MD5 (e2fsprogs-1.41.3.tar.gz) = b21d26fc46c584021dc9c444933ee1c2
-SHA256 (e2fsprogs-1.41.3.tar.gz) = ce77edae680d090cb8275eca9be282bdbc5fbef028d7bf6f772fb4f04b578d7a
-SIZE (e2fsprogs-1.41.3.tar.gz) = 4365234
+MD5 (e2fsprogs-1.41.4.tar.gz) = 59033388df36987d2b9c9bbf7e19bd57
+SHA256 (e2fsprogs-1.41.4.tar.gz) = 2cc10fee2b29add737e454eb634513135b34a638f7ca2b18364864fe089020dc
+SIZE (e2fsprogs-1.41.4.tar.gz) = 4389512
diff --git a/sysutils/e2fsprogs/pkg-install b/sysutils/e2fsprogs/pkg-install
index 2352bad6178e..eaf8242f192a 100644
--- a/sysutils/e2fsprogs/pkg-install
+++ b/sysutils/e2fsprogs/pkg-install
@@ -6,6 +6,23 @@ MODE="$2" # PRE-INSTALL, POST-INSTALL, DEINSTALL, POST-DEINSTALL
 
 case "$MODE" in
 POST-INSTALL)
+	# install fsck tool and wrapper.
+	err=0
+	for i in e2fsck fsck_ext2fs ; do
+		ln -f ${PKG_PREFIX}/sbin/${i} /sbin 2>/dev/null \
+		|| cp -p ${PKG_PREFIX}/sbin/${i} /sbin \
+		|| err=1
+	done
+	if test $err = 1 ; then
+		echo '========================================================================'
+		echo 'Warning: cannot install fsck to /sbin!'
+		echo 'Requesting ext2fs to be checked from /etc/fstab can cause boot failures!'
+		echo '========================================================================'
+		echo ''
+	fi
+	#
+	# install configuration file and update
+	#
 	if test -f ${PKG_PREFIX}/etc/mke2fs.conf; then
 		if cmp -s ${PKG_PREFIX}/etc/mke2fs.conf.dist \
 						${PKG_PREFIX}/etc/mke2fs.conf; then
@@ -20,7 +37,7 @@ POST-INSTALL)
 				echo "==========================================================================="
 			else
 				mv ${PKG_PREFIX}/etc/mke2fs.conf \
-				   ${PKG_PREFIX}/etc/mke2fs.conf.e2fsprogs-old
+					 ${PKG_PREFIX}/etc/mke2fs.conf.e2fsprogs-old
 				cp -f -p ${PKG_PREFIX}/etc/mke2fs.conf.dist \
 					${PKG_PREFIX}/etc/mke2fs.conf
 				echo "==========================================================================="
@@ -37,6 +54,8 @@ POST-INSTALL)
 	fi
 	;;
 DEINSTALL)
+	rm -f /sbin/fsck_ext2fs /sbin/e2fsck \
+	|| echo "Could not remove /sbin/fsck_ext2fs /sbin/e2fsck. Please remove manually."
 	if cmp -s ${PKG_PREFIX}/etc/mke2fs.conf \
 		${PKG_PREFIX}/etc/mke2fs.conf.dist
 	then
diff --git a/sysutils/e2fsprogs/pkg-plist b/sysutils/e2fsprogs/pkg-plist
index b13aa95a26ce..3e81e9eb8b01 100644
--- a/sysutils/e2fsprogs/pkg-plist
+++ b/sysutils/e2fsprogs/pkg-plist
@@ -15,9 +15,6 @@ sbin/fsck.ext3
 sbin/fsck.ext4
 sbin/fsck.ext4dev
 sbin/fsck_ext2fs
-@exec ln -f %D/sbin/e2fsck /sbin 2>/dev/null || cp -p %D/sbin/e2fsck /sbin
-@exec ln -f %D/sbin/fsck_ext2fs /sbin 2>/dev/null || cp -p %D/sbin/fsck_ext2fs /sbin
-@unexec rm -f /sbin/fsck_ext2fs /sbin/e2fsck
 sbin/logsave
 sbin/mke2fs
 sbin/mkfs.ext2