Attachment #50174 for bug #76488

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





PORTNAME=	e2fsprogs
PORTVERSION=	1.35
PORTREVISION=	4
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

.if !defined(WITHOUT_NLS)
USE_GETTEXT=	yes
.endif


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


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


		${WRKSRC}/${CONFIGURE_SCRIPT}

.include <bsd.port.pre.mk>

.if ${OSVERSION} < 491000
USE_GCC=	3.4
.endif

post-patch:
	${REINPLACE_CMD} -e 's|-DRESOURCE_TRACK||' ${WRKSRC}/e2fsck/Makefile.in




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

Return to bug 76488

Lines 7-13 Link Here

(-)/root/e2fsprogs/Makefile (-10 / +6 lines)
7		7
8	PORTNAME= e2fsprogs	8	PORTNAME= e2fsprogs
9	PORTVERSION= 1.35	9	PORTVERSION= 1.35
10	PORTREVISION= 3	10	PORTREVISION= 4
11	CATEGORIES= sysutils	11	CATEGORIES= sysutils
12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}	12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
13	MASTER_SITE_SUBDIR= ${PORTNAME}	13	MASTER_SITE_SUBDIR= ${PORTNAME}
Lines 15-21 Link Here
15	MAINTAINER= matthias.andree@gmx.de	15	MAINTAINER= matthias.andree@gmx.de
16	COMMENT= Utilities and library to manipulate an ext2 or ext3 filesystem	16	COMMENT= Utilities and library to manipulate an ext2 or ext3 filesystem
17		17
18	.if !defined(DISABLE_NLS)	18	.if !defined(WITHOUT_NLS)
19	USE_GETTEXT= yes	19	USE_GETTEXT= yes
20	.endif	20	.endif
21		21
Lines 29-35 Link Here
29	GNU_CONFIGURE= yes	29	GNU_CONFIGURE= yes
30	CONFIGURE_ARGS= --enable-elf-shlibs --disable-fsck "--with-ldopts=-L${LOCALBASE}/lib"	30	CONFIGURE_ARGS= --enable-elf-shlibs --disable-fsck "--with-ldopts=-L${LOCALBASE}/lib"
31	CONFIGURE_ENV+= CPPFLAGS='-I${WRKSRC}/lib -I${LOCALBASE}/include'	31	CONFIGURE_ENV+= CPPFLAGS='-I${WRKSRC}/lib -I${LOCALBASE}/include'
32	.if defined(DISABLE_NLS)	32	.if defined(WITHOUT_NLS)
33	CONFIGURE_ARGS+= --disable-nls	33	CONFIGURE_ARGS+= --disable-nls
34	PLIST_SUB= NLS="@comment "	34	PLIST_SUB= NLS="@comment "
35	.else	35	.else
Lines 53-62 Link Here
53		53
54	pre-everything::	54	pre-everything::
55	@${ECHO_CMD} "-------------------------------------------------------------"	55	@${ECHO_CMD} "-------------------------------------------------------------"
56	.if defined(DISABLE_NLS)	56	.if defined(WITHOUT_NLS)
57	@${ECHO_CMD} "National language support disabled, -DDISABLE_NLS in effect. "	57	@${ECHO_CMD} "National language support disabled, -DWITHOUT_NLS in effect. "
58	.else	58	.else
59	@${ECHO_CMD} "Use -DDISABLE_NLS to build without national language support."	59	@${ECHO_CMD} "Use -DWITHOUT_NLS to build without national language support."
60	.endif	60	.endif
61	@${ECHO_CMD} "-------------------------------------------------------------"	61	@${ECHO_CMD} "-------------------------------------------------------------"
62		62
Lines 65-74 Link Here
65	${WRKSRC}/${CONFIGURE_SCRIPT}	65	${WRKSRC}/${CONFIGURE_SCRIPT}
66		66
67	.include <bsd.port.pre.mk>	67	.include <bsd.port.pre.mk>
68
69	.if ${OSVERSION} < 491000
70	USE_GCC= 3.4
71	.endif
72		68
73	post-patch:	69	post-patch:
74	${REINPLACE_CMD} -e 's\|-DRESOURCE_TRACK\|\|' ${WRKSRC}/e2fsck/Makefile.in	70	${REINPLACE_CMD} -e 's\|-DRESOURCE_TRACK\|\|' ${WRKSRC}/e2fsck/Makefile.in

Line 0 Link Here

(-)/root/e2fsprogs/files/patch-MCONFIG--I-order (+34 lines)
	1	# This is a BitKeeper generated diff -Nru style patch.
	2	#
	3	# ChangeSet
	4	# 2005/01/20 03:17:31+01:00 matthias.andree@gmx.de
	5	# MCONFIG.in:
	6	# Rearrange -I options to give local includes precedence over
	7	# /usr/local/include, to unbreak the build when an older
	8	# e2fsprogs version (with includes) is installed under
	9	# /usr/local (for instance, on FreeBSD).
	10	#
	11	# MCONFIG.in
	12	# 2005/01/20 03:16:52+01:00 matthias.andree@gmx.de +2 -3
	13	# Rearrange -I options to give local includes precedence over
	14	# /usr/local/include, to unbreak the build when an older
	15	# e2fsprogs version (with includes) is installed under
	16	# /usr/local (for instance, on FreeBSD).
	17	#
	18	diff -Nru a/MCONFIG.in b/MCONFIG.in
	19	--- a/MCONFIG.in 2005-01-20 03:43:02 +01:00
	20	+++ b/MCONFIG.in 2005-01-20 03:43:02 +01:00
	21	@@ -34,11 +34,10 @@
	22	BUILD_CC = @BUILD_CC@
	23	DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
	24	CFLAGS = @CFLAGS@
	25	-CPPFLAGS = @CPPFLAGS@
	26	+CPPFLAGS = -I$(top_builddir)/lib -I$(top_srcdir)/lib @CPPFLAGS@
	27	INTL_FLAGS = @INTL_FLAGS@
	28	ALL_CFLAGS = $(CPPFLAGS) $(DEFS) $(USE_WFLAGS) $(CFLAGS) $(XTRA_CFLAGS) \
	29	- $(INTL_FLAGS) -I$(top_builddir)/lib -I$(top_srcdir)/lib \
	30	- $(LINUX_INCLUDE)
	31	+ $(INTL_FLAGS) $(LINUX_INCLUDE)
	32	LDFLAGS = @LDFLAGS@
	33	ALL_LDFLAGS = $(LDFLAGS)
	34	RM = @RM@