Attachment #83769 for bug #119623

View | Details | Raw Unified | Return to bug 119623
Collapse All | Expand All




#

PORTNAME=	e2fsprogs
PORTVERSION=	1.40.4
PORTREVISION?=	0
CATEGORIES?=	sysutils
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}

PLIST_SUB=	NLS=""
.endif

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



post-install:
	${INSTALL_PROGRAM} ${WRKSRC}/fsck_ext2fs ${PREFIX}/sbin/
	@: # 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 || \

Lines 1-3 Link Here

(-)/usr/home/emma/ports/sysutils/e2fsprogs/distinfo (-3 / +3 lines)
1	MD5 (e2fsprogs-1.40.3.tar.gz) = ad7ff4da7e200b9b25df58dc39989053	1	MD5 (e2fsprogs-1.40.4.tar.gz) = 124d744bdf9d443591eb8193c085944b
2	SHA256 (e2fsprogs-1.40.3.tar.gz) = 1d4bc00e2759b29ca3051da1154bcc53d817a4190b2a7130b3241f50ee6cb00f	2	SHA256 (e2fsprogs-1.40.4.tar.gz) = 2e1ece31b004ff1f4a26e5633e884eda11457b489bc854edaa0d7f024bc06564
3	SIZE (e2fsprogs-1.40.3.tar.gz) = 4064408	3	SIZE (e2fsprogs-1.40.4.tar.gz) = 4048867




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

Lines 33-39 Link Here

(-)/usr/home/emma/ports/sysutils/e2fsprogs/pkg-plist (-1 lines)
33	%%NLS%%share/locale/it/LC_MESSAGES/e2fsprogs.mo	33	%%NLS%%share/locale/it/LC_MESSAGES/e2fsprogs.mo
34	%%NLS%%share/locale/nl/LC_MESSAGES/e2fsprogs.mo	34	%%NLS%%share/locale/nl/LC_MESSAGES/e2fsprogs.mo
35	%%NLS%%share/locale/pl/LC_MESSAGES/e2fsprogs.mo	35	%%NLS%%share/locale/pl/LC_MESSAGES/e2fsprogs.mo
36	%%NLS%%share/locale/rw/LC_MESSAGES/e2fsprogs.mo
37	%%NLS%%share/locale/sv/LC_MESSAGES/e2fsprogs.mo	36	%%NLS%%share/locale/sv/LC_MESSAGES/e2fsprogs.mo
38	%%NLS%%share/locale/tr/LC_MESSAGES/e2fsprogs.mo	37	%%NLS%%share/locale/tr/LC_MESSAGES/e2fsprogs.mo
39	%%NLS%%share/locale/vi/LC_MESSAGES/e2fsprogs.mo	38	%%NLS%%share/locale/vi/LC_MESSAGES/e2fsprogs.mo

Return to bug 119623

Lines 6-12 Link Here

(-)/usr/home/emma/ports/sysutils/e2fsprogs/Makefile (-10 / +3 lines)
6	#	6	#
7		7
8	PORTNAME= e2fsprogs	8	PORTNAME= e2fsprogs
9	PORTVERSION= 1.40.3	9	PORTVERSION= 1.40.4
10	PORTREVISION?= 0	10	PORTREVISION?= 0
11	CATEGORIES?= sysutils	11	CATEGORIES?= sysutils
12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}	12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
Lines 57-73 Link Here
57	PLIST_SUB= NLS=""	57	PLIST_SUB= NLS=""
58	.endif	58	.endif
59		59
60	post-patch:	60	post-patch::
61	${REINPLACE_CMD} -E -e \	61	${REINPLACE_CMD} -E -e \
62	's:\$$\(libdir\)/pkgconfig:${PREFIX}/libdata/pkgconfig:' \	62	's:\$$\(libdir\)/pkgconfig:${PREFIX}/libdata/pkgconfig:' \
63	${WRKSRC}/lib/*/Makefile.in	63	${WRKSRC}/lib/*/Makefile.in
64	@: # disable uuidgen and filefrag
65	${REINPLACE_CMD} -E -e \
66	's/^(UPROGS.) uuidgen(.)/\1\2/; \
67	s/^(UMANPAGES.) uuidgen.1(.)/\1\2/; \
68	s/^(USPROGS.) filefrag(.)/\1\2/; \
69	s/filefrag\.8 //' \
70	${WRKSRC}/misc/Makefile.in
71	@: # don't build/install libext2fs.info	64	@: # don't build/install libext2fs.info
72	${REINPLACE_CMD} -e 's/ install-doc-libs$$//' ${WRKSRC}/Makefile.in	65	${REINPLACE_CMD} -e 's/ install-doc-libs$$//' ${WRKSRC}/Makefile.in
73		66
Lines 89-95 Link Here
89		82
90	post-install:	83	post-install:
91	${INSTALL_PROGRAM} ${WRKSRC}/fsck_ext2fs ${PREFIX}/sbin/	84	${INSTALL_PROGRAM} ${WRKSRC}/fsck_ext2fs ${PREFIX}/sbin/
92	@: # install into /sbin since we might need e2fsck early on	85	@: # stuff into /sbin since we might need e2fsck early on
93	${LN} ${PREFIX}/sbin/fsck_ext2fs /sbin/ 2>/dev/null \|\| \	86	${LN} ${PREFIX}/sbin/fsck_ext2fs /sbin/ 2>/dev/null \|\| \
94	${INSTALL_PROGRAM} ${PREFIX}/sbin/fsck_ext2fs /sbin/	87	${INSTALL_PROGRAM} ${PREFIX}/sbin/fsck_ext2fs /sbin/
95	${LN} ${PREFIX}/sbin/e2fsck /sbin/ 2>/dev/null \|\| \	88	${LN} ${PREFIX}/sbin/e2fsck /sbin/ 2>/dev/null \|\| \

Lines 1-6 Link Here

(-)/usr/home/emma/ports/sysutils/e2fsprogs/files/patch-misc_Makefile.in (-3 / +32 lines)
1	--- a/misc/Makefile.in.orig Sat Jun 30 16:57:47 2007	1	--- a/misc/Makefile.in.orig Tue Jan 1 04:35:42 2008
2	+++ b/misc/Makefile.in Sat Jun 30 16:58:17 2007	2	+++ b/misc/Makefile.in Sun Jan 13 10:46:31 2008
3	@@ -295,11 +295,9 @@	3	@@ -19,14 +19,14 @@
		4
		5	SPROGS= mke2fs badblocks tune2fs dumpe2fs blkid logsave \
		6	$(E2IMAGE_PROG) @FSCK_PROG@
		7	-USPROGS= mklost+found filefrag $(UUIDD_PROG)
		8	+USPROGS= mklost+found
		9	SMANPAGES= tune2fs.8 mklost+found.8 mke2fs.8 dumpe2fs.8 badblocks.8 \
		10	e2label.8 findfs.8 blkid.8 $(E2IMAGE_MAN) \
		11	- logsave.8 filefrag.8 $(UUIDD_MAN) @FSCK_MAN@
		12	+ logsave.8 @FSCK_MAN@
		13	FMANPAGES= mke2fs.conf.5
		14
		15	-UPROGS= chattr lsattr uuidgen
		16	-UMANPAGES= chattr.1 lsattr.1 uuidgen.1
		17	+UPROGS= chattr lsattr
		18	+UMANPAGES= chattr.1 lsattr.1
		19
		20	LPROGS= @E2INITRD_PROG@
		21
		22	@@ -251,8 +251,7 @@
		23	$(DESTDIR)$(root_sbindir) $(DESTDIR)$(bindir) \
		24	$(DESTDIR)$(man1dir) $(DESTDIR)$(man8dir) \
		25	$(DESTDIR)$(man1dir) $(DESTDIR)$(man5dir) \
		26	- $(DESTDIR)$(libdir) $(DESTDIR)/$(root_sysconfdir) \
		27	- $(DESTDIR)/etc/init.d
		28	+ $(DESTDIR)$(libdir) $(DESTDIR)/$(root_sysconfdir)
		29
		30	install: all $(SMANPAGES) $(UMANPAGES) installdirs
		31	@for i in $(SPROGS); do \
		32	@@ -312,11 +311,9 @@
4	echo " INSTALL_DATA $(man5dir)/$$i"; \	33	echo " INSTALL_DATA $(man5dir)/$$i"; \
5	$(INSTALL_DATA) $$i $(DESTDIR)$(man5dir)/$$i; \	34	$(INSTALL_DATA) $$i $(DESTDIR)$(man5dir)/$$i; \
6	done	35	done