diff -ruN --exclude=CVS /usr/ports/sysutils/e2fsprogs/Makefile /usr/home/emma/ports/sysutils/e2fsprogs/Makefile --- /usr/ports/sysutils/e2fsprogs/Makefile Fri Dec 21 23:29:46 2007 +++ /usr/home/emma/ports/sysutils/e2fsprogs/Makefile Sun Jan 13 12:05:44 2008 @@ -6,7 +6,7 @@ # PORTNAME= e2fsprogs -PORTVERSION= 1.40.3 +PORTVERSION= 1.40.4 PORTREVISION?= 0 CATEGORIES?= sysutils MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED} @@ -57,17 +57,10 @@ PLIST_SUB= NLS="" .endif -post-patch: +post-patch:: ${REINPLACE_CMD} -E -e \ 's:\$$\(libdir\)/pkgconfig:${PREFIX}/libdata/pkgconfig:' \ ${WRKSRC}/lib/*/Makefile.in - @: # disable uuidgen and filefrag - ${REINPLACE_CMD} -E -e \ - 's/^(UPROGS.*) uuidgen(.*)/\1\2/; \ - s/^(UMANPAGES.*) uuidgen.1(.*)/\1\2/; \ - s/^(USPROGS.*) filefrag(.*)/\1\2/; \ - s/filefrag\.8 //' \ - ${WRKSRC}/misc/Makefile.in @: # don't build/install libext2fs.info ${REINPLACE_CMD} -e 's/ install-doc-libs$$//' ${WRKSRC}/Makefile.in @@ -89,7 +82,7 @@ post-install: ${INSTALL_PROGRAM} ${WRKSRC}/fsck_ext2fs ${PREFIX}/sbin/ - @: # install into /sbin since we might need e2fsck early on + @: # 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 || \ diff -ruN --exclude=CVS /usr/ports/sysutils/e2fsprogs/distinfo /usr/home/emma/ports/sysutils/e2fsprogs/distinfo --- /usr/ports/sysutils/e2fsprogs/distinfo Fri Dec 21 23:29:46 2007 +++ /usr/home/emma/ports/sysutils/e2fsprogs/distinfo Tue Jan 1 21:31:03 2008 @@ -1,3 +1,3 @@ -MD5 (e2fsprogs-1.40.3.tar.gz) = ad7ff4da7e200b9b25df58dc39989053 -SHA256 (e2fsprogs-1.40.3.tar.gz) = 1d4bc00e2759b29ca3051da1154bcc53d817a4190b2a7130b3241f50ee6cb00f -SIZE (e2fsprogs-1.40.3.tar.gz) = 4064408 +MD5 (e2fsprogs-1.40.4.tar.gz) = 124d744bdf9d443591eb8193c085944b +SHA256 (e2fsprogs-1.40.4.tar.gz) = 2e1ece31b004ff1f4a26e5633e884eda11457b489bc854edaa0d7f024bc06564 +SIZE (e2fsprogs-1.40.4.tar.gz) = 4048867 diff -ruN --exclude=CVS /usr/ports/sysutils/e2fsprogs/files/patch-misc_Makefile.in /usr/home/emma/ports/sysutils/e2fsprogs/files/patch-misc_Makefile.in --- /usr/ports/sysutils/e2fsprogs/files/patch-misc_Makefile.in Wed Jul 4 13:32:35 2007 +++ /usr/home/emma/ports/sysutils/e2fsprogs/files/patch-misc_Makefile.in Sun Jan 13 10:46:55 2008 @@ -1,6 +1,35 @@ ---- a/misc/Makefile.in.orig Sat Jun 30 16:57:47 2007 -+++ b/misc/Makefile.in Sat Jun 30 16:58:17 2007 -@@ -295,11 +295,9 @@ +--- a/misc/Makefile.in.orig Tue Jan 1 04:35:42 2008 ++++ b/misc/Makefile.in Sun Jan 13 10:46:31 2008 +@@ -19,14 +19,14 @@ + + SPROGS= mke2fs badblocks tune2fs dumpe2fs blkid logsave \ + $(E2IMAGE_PROG) @FSCK_PROG@ +-USPROGS= mklost+found filefrag $(UUIDD_PROG) ++USPROGS= mklost+found + SMANPAGES= tune2fs.8 mklost+found.8 mke2fs.8 dumpe2fs.8 badblocks.8 \ + e2label.8 findfs.8 blkid.8 $(E2IMAGE_MAN) \ +- logsave.8 filefrag.8 $(UUIDD_MAN) @FSCK_MAN@ ++ logsave.8 @FSCK_MAN@ + FMANPAGES= mke2fs.conf.5 + +-UPROGS= chattr lsattr uuidgen +-UMANPAGES= chattr.1 lsattr.1 uuidgen.1 ++UPROGS= chattr lsattr ++UMANPAGES= chattr.1 lsattr.1 + + LPROGS= @E2INITRD_PROG@ + +@@ -251,8 +251,7 @@ + $(DESTDIR)$(root_sbindir) $(DESTDIR)$(bindir) \ + $(DESTDIR)$(man1dir) $(DESTDIR)$(man8dir) \ + $(DESTDIR)$(man1dir) $(DESTDIR)$(man5dir) \ +- $(DESTDIR)$(libdir) $(DESTDIR)/$(root_sysconfdir) \ +- $(DESTDIR)/etc/init.d ++ $(DESTDIR)$(libdir) $(DESTDIR)/$(root_sysconfdir) + + install: all $(SMANPAGES) $(UMANPAGES) installdirs + @for i in $(SPROGS); do \ +@@ -312,11 +311,9 @@ echo " INSTALL_DATA $(man5dir)/$$i"; \ $(INSTALL_DATA) $$i $(DESTDIR)$(man5dir)/$$i; \ done diff -ruN --exclude=CVS /usr/ports/sysutils/e2fsprogs/pkg-plist /usr/home/emma/ports/sysutils/e2fsprogs/pkg-plist --- /usr/ports/sysutils/e2fsprogs/pkg-plist Fri Dec 21 23:29:46 2007 +++ /usr/home/emma/ports/sysutils/e2fsprogs/pkg-plist Sun Jan 13 10:26:54 2008 @@ -33,7 +33,6 @@ %%NLS%%share/locale/it/LC_MESSAGES/e2fsprogs.mo %%NLS%%share/locale/nl/LC_MESSAGES/e2fsprogs.mo %%NLS%%share/locale/pl/LC_MESSAGES/e2fsprogs.mo -%%NLS%%share/locale/rw/LC_MESSAGES/e2fsprogs.mo %%NLS%%share/locale/sv/LC_MESSAGES/e2fsprogs.mo %%NLS%%share/locale/tr/LC_MESSAGES/e2fsprogs.mo %%NLS%%share/locale/vi/LC_MESSAGES/e2fsprogs.mo