From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Feb 6 13:00:27 2005 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B175316A4CF for ; Sun, 6 Feb 2005 13:00:27 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4488E43D2F for ; Sun, 6 Feb 2005 13:00:27 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.1/8.13.1) with ESMTP id j16D0RNn075677 for ; Sun, 6 Feb 2005 13:00:27 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.1/8.13.1/Submit) id j16D0R2Y075674; Sun, 6 Feb 2005 13:00:27 GMT (envelope-from gnats) Resent-Date: Sun, 6 Feb 2005 13:00:27 GMT Resent-Message-Id: <200502061300.j16D0R2Y075674@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Matthias Andree Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E99CA16A4CE for ; Sun, 6 Feb 2005 12:58:26 +0000 (GMT) Received: from mail.dt.e-technik.uni-dortmund.de (krusty.dt.e-technik.Uni-Dortmund.DE [129.217.163.1]) by mx1.FreeBSD.org (Postfix) with ESMTP id 045DD43D2F for ; Sun, 6 Feb 2005 12:58:26 +0000 (GMT) (envelope-from matthias.andree@gmx.de) Received: from localhost (localhost [127.0.0.1])1C84944234 for ; Sun, 6 Feb 2005 13:58:25 +0100 (CET) Received: from mail.dt.e-technik.uni-dortmund.de ([127.0.0.1]) by localhost (krusty [127.0.0.1]) (amavisd-new, port 10024) with LMTP id 19787-03-2 for ; Sun, 6 Feb 2005 13:58:20 +0100 (CET) Received: from m2a2.dyndns.org (pD9FFB003.dip.t-dialin.net [217.255.176.3]) AFA6C44233 for ; Sun, 6 Feb 2005 13:58:19 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by merlin.emma.line.org (Postfix) with ESMTP id C3F8177BCA; Sun, 6 Feb 2005 13:58:18 +0100 (CET) Received: from merlin.emma.line.org ([127.0.0.1]) by localhost (m2a2.dyndns.org [127.0.0.1]) (amavisd-new, port 10024) with LMTP id 08793-01; Sun, 6 Feb 2005 13:58:17 +0100 (CET) Received: from libertas.emma.line.org (libertas.emma.line.org [192.168.0.2]) by merlin.emma.line.org (Postfix) with ESMTP id 7E1E577BC8; Sun, 6 Feb 2005 13:58:17 +0100 (CET) Received: from emma by libertas.emma.line.org with local (Exim 4.44 (FreeBSD)) id 1CxlzU-0008iu-GR; Sun, 06 Feb 2005 13:58:16 +0100 Message-Id: Date: Sun, 06 Feb 2005 13:58:16 +0100 From: Matthias Andree Sender: Matthias Andree To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/77166: [MAINTAINER] sysutils/e2fsprogs: update to 1.36 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Feb 2005 13:00:27 -0000 >Number: 77166 >Category: ports >Synopsis: [MAINTAINER] sysutils/e2fsprogs: update to 1.36 >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: Sun Feb 06 13:00:26 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Matthias Andree >Release: FreeBSD 4.11-RELEASE i386 >Organization: >Environment: System: FreeBSD libertas.emma.line.org 4.11-RELEASE FreeBSD 4.11-RELEASE #1: Wed Jan 26 02:58:33 CET 2005 >Description: - Update to 1.36 - remove MCONFIG patch, merged upstream - shorten COMMENT for pkg_info - drop USE_AUTOCONF_VER, no longer needed - libuuid.3 man page renamed to uuid.3 - the test suite is more portable now, ridding us of hacking it (post-patch) - upstream package now has .pc (pkgconfig) files, patch Makefiles for proper location, libdata/pkgconfig (rather than lib/pkgconfig) - work around packaging bug, run update-gmo in po/ directory for NLS - minor revision files/pkg-message.in - update pkg-plist Removed file(s): - files/patch-MCONFIG--I-order Generated with FreeBSD Port Tools 0.63 >How-To-Repeat: >Fix: --- e2fsprogs-1.36.patch begins here --- diff -ruN --exclude=CVS /usr/ports/sysutils/e2fsprogs/Makefile /root/ports/sysutils/e2fsprogs/Makefile --- /usr/ports/sysutils/e2fsprogs/Makefile Sat Jan 22 04:14:02 2005 +++ /root/ports/sysutils/e2fsprogs/Makefile Sun Feb 6 13:49:25 2005 @@ -6,21 +6,19 @@ # PORTNAME= e2fsprogs -PORTVERSION= 1.35 -PORTREVISION= 4 +PORTVERSION= 1.36 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED} MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= matthias.andree@gmx.de -COMMENT= Utilities and library to manipulate an ext2 or ext3 filesystem +COMMENT= Utilities and library to manipulate ext2/ext3 filesystems .if !defined(WITHOUT_NLS) USE_GETTEXT= yes .endif PATCH_STRIP= -p1 -USE_AUTOCONF_VER= 213 USE_REINPLACE= yes USE_GMAKE= yes INSTALL_TARGET= install install-libs @@ -42,7 +40,7 @@ PKGMESSAGE= ${WRKDIR}/pkg-message MAN1= chattr.1 lsattr.1 uuidgen.1 compile_et.1 mk_cmds.1 -MAN3= libuuid.3 uuid_clear.3 com_err.3 uuid_compare.3 uuid_copy.3 \ +MAN3= uuid.3 uuid_clear.3 com_err.3 uuid_compare.3 uuid_copy.3 \ uuid_generate.3 uuid_is_null.3 uuid_parse.3 uuid_time.3 \ uuid_unparse.3 uuid_generate_random.3 uuid_generate_time.3 \ libblkid.3 @@ -67,22 +65,17 @@ .include post-patch: - ${REINPLACE_CMD} -e 's|-DRESOURCE_TRACK||' ${WRKSRC}/e2fsck/Makefile.in - ${GUNZIP_CMD} ${WRKSRC}/tests/m_*/expect*.gz - ${REINPLACE_CMD} -e 's|OS type: Linux|OS type: (unknown os)|' \ - -e 's|Filesystem OS type: Linux|Filesystem OS type: unknown|' \ - -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 ${ARCH} == "alpha" || ${ARCH} == "sparc64" - ${RM} -rf ${WRKSRC}/tests/m_large_file -.endif + ${REINPLACE_CMD} -E -e 's:\$$\(libdir\)/pkgconfig:${PREFIX}/libdata/pkgconfig:' \ + ${WRKSRC}/lib/*/Makefile.in pre-install: ${RM} -f ${PKGMESSAGE} ${SED} -e "s:%%PREFIX%%:${PREFIX}:" ${FILESDIR}/pkg-message.in > ${PKGMESSAGE} post-build: +.if !defined(WITHOUT_NLS) + cd ${WRKSRC}/po && ${GMAKE} update-gmo +.endif ${CC} ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} ${LIBS} -o ${WRKSRC}/fsck_ext2fs ${FILESDIR}/fsck_ext2fs.c cd ${WRKSRC}/tests && ${GMAKE} check diff -ruN --exclude=CVS /usr/ports/sysutils/e2fsprogs/distinfo /root/ports/sysutils/e2fsprogs/distinfo --- /usr/ports/sysutils/e2fsprogs/distinfo Mon Mar 1 13:16:23 2004 +++ /root/ports/sysutils/e2fsprogs/distinfo Sun Feb 6 10:36:16 2005 @@ -1,2 +1,2 @@ -MD5 (e2fsprogs-1.35.tar.gz) = 8d25ffd60d405ef32d341704a2323807 -SIZE (e2fsprogs-1.35.tar.gz) = 3152299 +MD5 (e2fsprogs-1.36.tar.gz) = 1804ee96b76e5e7113fe3cecd6fe582b +SIZE (e2fsprogs-1.36.tar.gz) = 3264042 diff -ruN --exclude=CVS /usr/ports/sysutils/e2fsprogs/files/patch-MCONFIG--I-order /root/ports/sysutils/e2fsprogs/files/patch-MCONFIG--I-order --- /usr/ports/sysutils/e2fsprogs/files/patch-MCONFIG--I-order Fri Jan 21 00:24:35 2005 +++ /root/ports/sysutils/e2fsprogs/files/patch-MCONFIG--I-order Thu Jan 1 01:00:00 1970 @@ -1,34 +0,0 @@ -# This is a BitKeeper generated diff -Nru style patch. -# -# ChangeSet -# 2005/01/20 03:17:31+01:00 matthias.andree@gmx.de -# MCONFIG.in: -# Rearrange -I options to give local includes precedence over -# /usr/local/include, to unbreak the build when an older -# e2fsprogs version (with includes) is installed under -# /usr/local (for instance, on FreeBSD). -# -# MCONFIG.in -# 2005/01/20 03:16:52+01:00 matthias.andree@gmx.de +2 -3 -# Rearrange -I options to give local includes precedence over -# /usr/local/include, to unbreak the build when an older -# e2fsprogs version (with includes) is installed under -# /usr/local (for instance, on FreeBSD). -# -diff -Nru a/MCONFIG.in b/MCONFIG.in ---- a/MCONFIG.in 2005-01-20 03:43:02 +01:00 -+++ b/MCONFIG.in 2005-01-20 03:43:02 +01:00 -@@ -34,11 +34,10 @@ - BUILD_CC = @BUILD_CC@ - DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@ - CFLAGS = @CFLAGS@ --CPPFLAGS = @CPPFLAGS@ -+CPPFLAGS = -I$(top_builddir)/lib -I$(top_srcdir)/lib @CPPFLAGS@ - INTL_FLAGS = @INTL_FLAGS@ - ALL_CFLAGS = $(CPPFLAGS) $(DEFS) $(USE_WFLAGS) $(CFLAGS) $(XTRA_CFLAGS) \ -- $(INTL_FLAGS) -I$(top_builddir)/lib -I$(top_srcdir)/lib \ -- $(LINUX_INCLUDE) -+ $(INTL_FLAGS) $(LINUX_INCLUDE) - LDFLAGS = @LDFLAGS@ - ALL_LDFLAGS = $(LDFLAGS) - RM = @RM@ diff -ruN --exclude=CVS /usr/ports/sysutils/e2fsprogs/files/pkg-message.in /root/ports/sysutils/e2fsprogs/files/pkg-message.in --- /usr/ports/sysutils/e2fsprogs/files/pkg-message.in Wed Mar 3 20:50:48 2004 +++ /root/ports/sysutils/e2fsprogs/files/pkg-message.in Sun Feb 6 11:38:09 2005 @@ -1,6 +1,6 @@ Note: this is a modified version of the e2fsprogs package, not the official package. Report all building and run-time trouble that originates in the -package to the port maintainer, matthias.andree@gmx.de. +package to the port maintainer, . To have your ext2 and ext3 filesystems fsck'ed correctly without explicitly invoking the fsck_ext2fs utility installed by this port you will need to @@ -11,4 +11,4 @@ ln -f %%PREFIX%%/sbin/e2fsck /sbin/e2fsck 2>/dev/null \ || install -m755 %%PREFIX%%/sbin/e2fsck /sbin/e2fsck -IMPORTANT: you also need to repeat the above steps after a port upgrade! +IMPORTANT: you also need to repeat the steps above after a port upgrade! diff -ruN --exclude=CVS /usr/ports/sysutils/e2fsprogs/pkg-plist /root/ports/sysutils/e2fsprogs/pkg-plist --- /usr/ports/sysutils/e2fsprogs/pkg-plist Wed Mar 3 20:50:48 2004 +++ /root/ports/sysutils/e2fsprogs/pkg-plist Sun Feb 6 13:32:04 2005 @@ -17,8 +17,8 @@ include/ss/ss.h include/ss/ss_err.h include/uuid/uuid.h -include/uuid/uuid_types.h info/libext2fs.info.gz +lib/e2initrd_helper lib/libblkid.a lib/libblkid.so.1.0 lib/libblkid.so.1 @@ -35,6 +35,13 @@ lib/libext2fs.so lib/libext2fs.so.2 lib/libext2fs.so.2.4 +libdata/pkgconfig/blkid.pc +libdata/pkgconfig/com_err.pc +libdata/pkgconfig/e2p.pc +libdata/pkgconfig/ext2fs.pc +libdata/pkgconfig/ss.pc +libdata/pkgconfig/uuid.pc +@unexec rmdir %B 2>/dev/null || true lib/libss.a lib/libss.so.2.0 lib/libss.so.2 @@ -68,11 +75,12 @@ %%NLS%%share/locale/cs/LC_MESSAGES/e2fsprogs.mo %%NLS%%share/locale/de/LC_MESSAGES/e2fsprogs.mo %%NLS%%share/locale/es/LC_MESSAGES/e2fsprogs.mo +%%NLS%%share/locale/fr/LC_MESSAGES/e2fsprogs.mo %%NLS%%share/locale/it/LC_MESSAGES/e2fsprogs.mo %%NLS%%share/locale/pl/LC_MESSAGES/e2fsprogs.mo %%NLS%%share/locale/sv/LC_MESSAGES/e2fsprogs.mo %%NLS%%share/locale/tr/LC_MESSAGES/e2fsprogs.mo -%%NLS%%@unexec for i in cs de es it pl sv tr ; do rmdir -p %D/share/locale/$i/LC_MESSAGES 2>/dev/null || true ; done +%%NLS%%@unexec for i in cs de es fr it pl sv tr ; do rmdir -p %D/share/locale/$i/LC_MESSAGES 2>/dev/null || true ; done @dirrm share/ss @dirrm share/et @dirrm include/uuid --- e2fsprogs-1.36.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: