- 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
- update CONFLICTS

PR:		77166
Submitted by:	Matthias Andree <matthias.andree at gmx.de>

5 files changed, 23 insertions, 56 deletions

diff --git a/sysutils/e2fsprogs/Makefile b/sysutils/e2fsprogs/Makefile
index 4473ef7..5c406b6 100644
--- a/sysutils/e2fsprogs/Makefile
+++ b/sysutils/e2fsprogs/Makefile
@@ -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
@@ -37,12 +35,12 @@ MAKE_ARGS+=	STATIC_LIBS="../lib/libext2fs.a ../lib/libcom_err.a ../lib/libblkid.
 PLIST_SUB=	NLS=""
 .endif
 
-CONFLICTS=	ossp-uuid-*
+CONFLICTS=	ossp-uuid-[0-9]*
 
 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 @@ post-extract:
 .include <bsd.port.pre.mk>
 
 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 --git a/sysutils/e2fsprogs/distinfo b/sysutils/e2fsprogs/distinfo
index 36f5daf..7d11335 100644
--- a/sysutils/e2fsprogs/distinfo
+++ b/sysutils/e2fsprogs/distinfo
@@ -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 --git a/sysutils/e2fsprogs/files/patch-MCONFIG--I-order b/sysutils/e2fsprogs/files/patch-MCONFIG--I-order
deleted file mode 100644
index 8a4f556..0000000
--- a/sysutils/e2fsprogs/files/patch-MCONFIG--I-order
+++ /dev/null
@@ -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 --git a/sysutils/e2fsprogs/files/pkg-message.in b/sysutils/e2fsprogs/files/pkg-message.in
index 47aa662..7579493 100644
--- a/sysutils/e2fsprogs/files/pkg-message.in
+++ b/sysutils/e2fsprogs/files/pkg-message.in
@@ -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, <matthias.andree@gmx.de>.
 
 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/fsck_ext2fs /sbin/ 2>/dev/null \
 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 --git a/sysutils/e2fsprogs/pkg-plist b/sysutils/e2fsprogs/pkg-plist
index 492e41e0..f27d26e 100644
--- a/sysutils/e2fsprogs/pkg-plist
+++ b/sysutils/e2fsprogs/pkg-plist
@@ -17,8 +17,8 @@ include/ext2fs/ext2fs.h
 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.a
 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 @@ share/ss/ct_c.sed
 %%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