Date: Sat, 21 Feb 2004 13:47:38 +0100 (CET) From: Matthias Andree <matthias.andree@gmx.de> To: FreeBSD-gnats-submit@FreeBSD.org Cc: Tim Robbins <tjr@FreeBSD.org> Subject: ports/63167: [MAINTAINER] sysutils/e2fsprogs: minor fix-ups Message-ID: <20040221124738.BD5961B209@merlin.emma.line.org> Resent-Message-ID: <200402211250.i1LCoMlj078993@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 63167
>Category: ports
>Synopsis: [MAINTAINER] sysutils/e2fsprogs: minor fix-ups
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sat Feb 21 04:50:22 PST 2004
>Closed-Date:
>Last-Modified:
>Originator: Matthias Andree
>Release: FreeBSD 5.2-CURRENT i386
>Organization:
>Environment:
System: FreeBSD merlin.emma.line.org 5.2-CURRENT FreeBSD 5.2-CURRENT #8: Wed Feb 18 03:21:38 CET 2004
>Description:
SUPERSEDES: PR #63166
adds new file pkg-deinstall, remember to cvs add
- fix IEEE violation/SIGFPE abort on alpha that failed the f_crashdisk test
(patch by Greg Lewis)
- fix compile failure on FreeBSD 5 when older port version is installed
(problem reported by Tim Robbins; FreeBSD 4 was unaffected)
- ignore m_large_file test on alpha and sparc64, apparently the test
only stumbles over a different default block size and the failure
isn't serious (problem reported by Greg Lewis)
- cosmetic: swap $(CC) and gmake check in post-build so check comes last
- bump PORTREVISION: the patches change the code on some systems
Additional changes since PR #63166:
- pkg-message.in:
* use install when ln fails, /sbin and /usr/local
need not be the same file system
* tell the user he needs to repeat the steps after port upgrade
- revise pkg-message generation and move it to pre-install,
no need to cat(1) the file, sed(1) can read files by itself.
- add pkg-deinstall: remind the user to remove e2fsck and fsck_ext2fs from
/sbin if he's deinstalling for good, rather than upgrading.
Generated with FreeBSD Port Tools 0.50
>How-To-Repeat:
>Fix:
--- e2fsprogs-1.35.w20040131_1.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/sysutils/e2fsprogs/Makefile /root/e2fsprogs/Makefile
--- /usr/ports/sysutils/e2fsprogs/Makefile Sat Feb 21 13:01:51 2004
+++ /root/e2fsprogs/Makefile Sat Feb 21 13:35:20 2004
@@ -7,6 +7,7 @@
PORTNAME= e2fsprogs
PORTVERSION= 1.35.w20040131
+PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -29,7 +30,7 @@
NO_FILTER_SHLIBS= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-elf-shlibs --disable-fsck "--with-ldopts=-L${LOCALBASE}/lib"
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include"
+CONFIGURE_ENV+= CPPFLAGS='-I${WRKSRC}/lib -I${LOCALBASE}/include'
.if defined(DISABLE_NLS)
CONFIGURE_ARGS+= --disable-nls
PLIST_SUB= NLS="@comment "
@@ -37,6 +38,9 @@
MAKE_ARGS+= STATIC_LIBS="../lib/libext2fs.a ../lib/libcom_err.a ../lib/libblkid.a ../lib/libuuid.a ${LOCALBASE}/lib/libintl.a ${LOCALBASE}/lib/libiconv.a"
PLIST_SUB= NLS=""
.endif
+.if ${MACHINE_ARCH} == "alpha"
+CFLAGS+= -mieee
+.endif
CONFLICTS= ossp-uuid-*
@@ -68,13 +72,17 @@
-e 's|group root|group wheel|' \
-e '/Exit status is 0/ N;s/Exit status is 0\n/Exit status is 0/' \
${WRKSRC}/tests/m_*/expect.1
+.if ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "sparc64"
+ ${RM} -r ${WRKSRC}/tests/m_large_file
+.endif
-post-configure:
- @${CAT} ${FILESDIR}/pkg-message.in | ${SED} -e "s:%%PREFIX%%:${PREFIX}:" > ${PKGMESSAGE}
+pre-install:
+ ${RM} -f ${PKGMESSAGE}
+ ${SED} -e "s:%%PREFIX%%:${PREFIX}:" ${FILESDIR}/pkg-message.in > ${PKGMESSAGE}
post-build:
- cd ${WRKSRC}/tests && ${GMAKE} check
${CC} ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} ${LIBS} -o ${WRKSRC}/fsck_ext2fs ${FILESDIR}/fsck_ext2fs.c
+ cd ${WRKSRC}/tests && ${GMAKE} check
post-install:
${RM} ${PREFIX}/sbin/filefrag
diff -ruN --exclude=CVS /usr/ports/sysutils/e2fsprogs/files/pkg-message.in /root/e2fsprogs/files/pkg-message.in
--- /usr/ports/sysutils/e2fsprogs/files/pkg-message.in Fri Feb 20 23:46:21 2004
+++ /root/e2fsprogs/files/pkg-message.in Sat Feb 21 13:35:27 2004
@@ -2,5 +2,9 @@
invoking the fsck_ext2fs utility installed by this port you will need to
create links for the fsck utilities installed by this port in /sbin, e.g.
-ln %%PREFIX%%/sbin/fsck_ext2fs /sbin/
-ln %%PREFIX%%/sbin/e2fsck.static /sbin/e2fsck
+ln -f %%PREFIX%%/sbin/fsck_ext2fs /sbin/ 2>/dev/null \
+ || install -m755 %%PREFIX%%/sbin/fsck_ext2fs /sbin/
+ln -f %%PREFIX%%/sbin/e2fsck.static /sbin/e2fsck 2>/dev/null \
+ || install -m755 %%PREFIX%%/sbin/e2fsck.static /sbin/e2fsck
+
+IMPORTANT: you also need to repeat the above steps after a port upgrade!
diff -ruN --exclude=CVS /usr/ports/sysutils/e2fsprogs/pkg-deinstall /root/e2fsprogs/pkg-deinstall
--- /usr/ports/sysutils/e2fsprogs/pkg-deinstall Thu Jan 1 01:00:00 1970
+++ /root/e2fsprogs/pkg-deinstall Sat Feb 21 13:38:58 2004
@@ -0,0 +1,9 @@
+if [ "$2" = "POST-DEINSTALL" ] ; then cat - <<_EOF
+
+If you are deinstalling the e2fsprogs port for good, rather than upgrading it,
+remember to remove the files you have installed into /sbin, example:
+
+rm -f /sbin/fsck_ext2fs /sbin/e2fsck
+
+_EOF
+fi
--- e2fsprogs-1.35.w20040131_1.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040221124738.BD5961B209>