Index: head/sysutils/e2fsprogs/Makefile =================================================================== --- head/sysutils/e2fsprogs/Makefile (revision 128165) +++ head/sysutils/e2fsprogs/Makefile (revision 128166) @@ -1,97 +1,90 @@ # New ports collection makefile for: e2fsprogs # Date created: 3 July 2001 # Whom: Maxim Sobolev # # $FreeBSD$ # 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 INSTALLS_SHLIB= yes NO_FILTER_SHLIBS= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-elf-shlibs --disable-fsck "--with-ldopts=-L${LOCALBASE}/lib" CONFIGURE_ENV+= CPPFLAGS='-I${WRKSRC}/lib -I${LOCALBASE}/include' .if defined(WITHOUT_NLS) CONFIGURE_ARGS+= --disable-nls PLIST_SUB= NLS="@comment " .else 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 -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 MAN8= badblocks.8 debugfs.8 dumpe2fs.8 e2fsck.8 e2image.8 e2label.8 \ mke2fs.8 mklost+found.8 resize2fs.8 tune2fs.8 \ fsck.ext2.8 fsck.ext3.8 mkfs.ext2.8 mkfs.ext3.8 \ findfs.8 blkid.8 logsave.8 pre-everything:: @${ECHO_CMD} "-------------------------------------------------------------" .if defined(WITHOUT_NLS) @${ECHO_CMD} "National language support disabled, -DWITHOUT_NLS in effect. " .else @${ECHO_CMD} "Use -DWITHOUT_NLS to build without national language support." .endif @${ECHO_CMD} "-------------------------------------------------------------" post-extract: ${CHMOD} u+w ${WRKSRC}/po/*.po ${WRKSRC}/po/*.pot \ ${WRKSRC}/${CONFIGURE_SCRIPT} .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 post-install: ${RM} ${PREFIX}/sbin/filefrag ${RM} ${PREFIX}/man/man8/filefrag.8 ${INSTALL_PROGRAM} ${WRKSRC}/fsck_ext2fs ${PREFIX}/sbin/ @${ECHO_MSG} @${CAT} ${PKGMESSAGE} @${ECHO_MSG} .include Property changes on: head/sysutils/e2fsprogs/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.22 \ No newline at end of property +1.23 \ No newline at end of property Index: head/sysutils/e2fsprogs/distinfo =================================================================== --- head/sysutils/e2fsprogs/distinfo (revision 128165) +++ head/sysutils/e2fsprogs/distinfo (revision 128166) @@ -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 Property changes on: head/sysutils/e2fsprogs/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.6 \ No newline at end of property +1.7 \ No newline at end of property Index: head/sysutils/e2fsprogs/files/patch-MCONFIG--I-order =================================================================== --- head/sysutils/e2fsprogs/files/patch-MCONFIG--I-order (revision 128165) +++ head/sysutils/e2fsprogs/files/patch-MCONFIG--I-order (nonexistent) @@ -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@ Property changes on: head/sysutils/e2fsprogs/files/patch-MCONFIG--I-order ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.1 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/sysutils/e2fsprogs/files/pkg-message.in =================================================================== --- head/sysutils/e2fsprogs/files/pkg-message.in (revision 128165) +++ head/sysutils/e2fsprogs/files/pkg-message.in (revision 128166) @@ -1,14 +1,14 @@ 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 create links for the fsck utilities installed by this port in /sbin, e.g. ln -f %%PREFIX%%/sbin/fsck_ext2fs /sbin/ 2>/dev/null \ || install -m755 %%PREFIX%%/sbin/fsck_ext2fs /sbin/ 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! Property changes on: head/sysutils/e2fsprogs/files/pkg-message.in ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.4 \ No newline at end of property +1.5 \ No newline at end of property Index: head/sysutils/e2fsprogs/pkg-plist =================================================================== --- head/sysutils/e2fsprogs/pkg-plist (revision 128165) +++ head/sysutils/e2fsprogs/pkg-plist (revision 128166) @@ -1,83 +1,91 @@ bin/chattr bin/compile_et bin/lsattr bin/mk_cmds bin/uuidgen include/blkid/blkid.h include/blkid/blkid_types.h include/e2p/e2p.h include/et/com_err.h include/ext2fs/bitops.h include/ext2fs/ext2_err.h include/ext2fs/ext2_ext_attr.h include/ext2fs/ext2_fs.h include/ext2fs/ext2_io.h include/ext2fs/ext2_types.h 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 lib/libblkid.so lib/libcom_err.a lib/libcom_err.so.2.1 lib/libcom_err.so.2 lib/libcom_err.so lib/libe2p.a lib/libe2p.so lib/libe2p.so.2 lib/libe2p.so.2.3 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 lib/libss.so lib/libuuid.a lib/libuuid.so lib/libuuid.so.1 lib/libuuid.so.1.2 sbin/badblocks sbin/blkid sbin/debugfs sbin/dumpe2fs sbin/e2fsck sbin/e2image sbin/e2label sbin/findfs sbin/fsck.ext2 sbin/fsck.ext3 sbin/fsck_ext2fs sbin/logsave sbin/mke2fs sbin/mkfs.ext2 sbin/mkfs.ext3 sbin/mklost+found sbin/resize2fs sbin/tune2fs share/et/et_c.awk share/et/et_h.awk share/ss/ct_c.awk 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 @dirrm include/ss @dirrm include/ext2fs @dirrm include/et @dirrm include/e2p @dirrm include/blkid Property changes on: head/sysutils/e2fsprogs/pkg-plist ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.6 \ No newline at end of property +1.7 \ No newline at end of property