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

(-)/root/e2fsprogs/Makefile (-4 / +12 lines)
Lines 7-12 Link Here
7
7
8
PORTNAME=	e2fsprogs
8
PORTNAME=	e2fsprogs
9
PORTVERSION=	1.35.w20040131
9
PORTVERSION=	1.35.w20040131
10
PORTREVISION=	1
10
CATEGORIES=	sysutils
11
CATEGORIES=	sysutils
11
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
12
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
12
MASTER_SITE_SUBDIR=	${PORTNAME}
13
MASTER_SITE_SUBDIR=	${PORTNAME}
Lines 29-35 Link Here
29
NO_FILTER_SHLIBS=	yes
30
NO_FILTER_SHLIBS=	yes
30
GNU_CONFIGURE=	yes
31
GNU_CONFIGURE=	yes
31
CONFIGURE_ARGS=	--enable-elf-shlibs --disable-fsck "--with-ldopts=-L${LOCALBASE}/lib"
32
CONFIGURE_ARGS=	--enable-elf-shlibs --disable-fsck "--with-ldopts=-L${LOCALBASE}/lib"
32
CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include"
33
CONFIGURE_ENV+=	CPPFLAGS='-I${WRKSRC}/lib -I${LOCALBASE}/include'
33
.if defined(DISABLE_NLS)
34
.if defined(DISABLE_NLS)
34
CONFIGURE_ARGS+=	--disable-nls
35
CONFIGURE_ARGS+=	--disable-nls
35
PLIST_SUB=	NLS="@comment "
36
PLIST_SUB=	NLS="@comment "
Lines 37-42 Link Here
37
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"
38
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"
38
PLIST_SUB=	NLS=""
39
PLIST_SUB=	NLS=""
39
.endif
40
.endif
41
.if ${MACHINE_ARCH} == "alpha"
42
CFLAGS+=	-mieee
43
.endif
40
44
41
CONFLICTS=	ossp-uuid-*
45
CONFLICTS=	ossp-uuid-*
42
46
Lines 68-80 Link Here
68
	-e 's|group root|group wheel|' \
72
	-e 's|group root|group wheel|' \
69
	-e '/Exit status is 0/ N;s/Exit status is 0\n/Exit status is 0/' \
73
	-e '/Exit status is 0/ N;s/Exit status is 0\n/Exit status is 0/' \
70
	${WRKSRC}/tests/m_*/expect.1
74
	${WRKSRC}/tests/m_*/expect.1
75
.if ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "sparc64"
76
	${RM} -r ${WRKSRC}/tests/m_large_file
77
.endif
71
78
72
post-configure:
79
pre-install:
73
	@${CAT} ${FILESDIR}/pkg-message.in | ${SED} -e "s:%%PREFIX%%:${PREFIX}:" > ${PKGMESSAGE}
80
	${RM} -f ${PKGMESSAGE}
81
	${SED} -e "s:%%PREFIX%%:${PREFIX}:" ${FILESDIR}/pkg-message.in > ${PKGMESSAGE}
74
82
75
post-build:
83
post-build:
76
	cd ${WRKSRC}/tests && ${GMAKE} check
77
	${CC} ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} ${LIBS} -o ${WRKSRC}/fsck_ext2fs ${FILESDIR}/fsck_ext2fs.c
84
	${CC} ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} ${LIBS} -o ${WRKSRC}/fsck_ext2fs ${FILESDIR}/fsck_ext2fs.c
85
	cd ${WRKSRC}/tests && ${GMAKE} check
78
86
79
post-install:
87
post-install:
80
	${RM} ${PREFIX}/sbin/filefrag
88
	${RM} ${PREFIX}/sbin/filefrag
(-)/root/e2fsprogs/files/pkg-message.in (-2 / +6 lines)
Lines 2-6 Link Here
2
invoking the fsck_ext2fs utility installed by this port you will need to
2
invoking the fsck_ext2fs utility installed by this port you will need to
3
create links for the fsck utilities installed by this port in /sbin, e.g.
3
create links for the fsck utilities installed by this port in /sbin, e.g.
4
4
5
ln %%PREFIX%%/sbin/fsck_ext2fs /sbin/
5
ln -f %%PREFIX%%/sbin/fsck_ext2fs /sbin/ 2>/dev/null \
6
ln %%PREFIX%%/sbin/e2fsck.static /sbin/e2fsck
6
  || install -m755 %%PREFIX%%/sbin/fsck_ext2fs /sbin/
7
ln -f %%PREFIX%%/sbin/e2fsck.static /sbin/e2fsck 2>/dev/null \
8
  || install -m755 %%PREFIX%%/sbin/e2fsck.static /sbin/e2fsck
9
10
IMPORTANT: you also need to repeat the above steps after a port upgrade!
(-)/root/e2fsprogs/pkg-deinstall (+9 lines)
Line 0 Link Here
1
if [ "$2" = "POST-DEINSTALL" ] ; then cat - <<_EOF
2
3
If you are deinstalling the e2fsprogs port for good, rather than upgrading it,
4
remember to remove the files you have installed into /sbin, example:
5
6
rm -f /sbin/fsck_ext2fs /sbin/e2fsck
7
8
_EOF
9
fi

Return to bug 63167