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

(-)Makefile (-2 / +8 lines)
Lines 9-15 Link Here
9
PORTNAME=		bash
9
PORTNAME=		bash
10
PATCHLEVEL=		7
10
PATCHLEVEL=		7
11
PORTVERSION=		4.1.${PATCHLEVEL:S/^0//g}
11
PORTVERSION=		4.1.${PATCHLEVEL:S/^0//g}
12
PORTREVISION?=		1
12
PORTREVISION?=		2
13
CATEGORIES=		shells
13
CATEGORIES=		shells
14
MASTER_SITES=		${MASTER_SITE_GNU:S/$/:bash/} \
14
MASTER_SITES=		${MASTER_SITE_GNU:S/$/:bash/} \
15
			ftp://ftp.cwru.edu/pub/%SUBDIR%/:faq
15
			ftp://ftp.cwru.edu/pub/%SUBDIR%/:faq
Lines 45-51 Link Here
45
MAKE_JOBS_UNSAFE=	yes
45
MAKE_JOBS_UNSAFE=	yes
46
GNU_CONFIGURE=		yes
46
GNU_CONFIGURE=		yes
47
USE_BISON=		build
47
USE_BISON=		build
48
USE_ICONV=		yes
49
48
50
.if !defined(NOPORTDOCS)
49
.if !defined(NOPORTDOCS)
51
.if !defined(WITH_INCLUDED_FAQ)
50
.if !defined(WITH_INCLUDED_FAQ)
Lines 84-89 Link Here
84
CONFIGURE_ARGS+=	--disable-nls
83
CONFIGURE_ARGS+=	--disable-nls
85
PLIST_SUB+=		NLS="@comment "
84
PLIST_SUB+=		NLS="@comment "
86
.else
85
.else
86
USE_ICONV=		yes
87
USE_GETTEXT=		yes
87
USE_GETTEXT=		yes
88
PLIST_SUB+=		NLS=""
88
PLIST_SUB+=		NLS=""
89
.endif
89
.endif
Lines 100-109 Link Here
100
100
101
post-patch:
101
post-patch:
102
	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/doc/bash.1
102
	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/doc/bash.1
103
.if defined(WITHOUT_NLS)
104
	@${REINPLACE_CMD} -e "s|@LIBICONV@||g" ${WRKSRC}/Makefile.in
105
.endif
103
106
104
post-configure:
107
post-configure:
105
	@${FIND} ${WRKSRC} -name Makefile -print0 | ${XARGS} -0 \
108
	@${FIND} ${WRKSRC} -name Makefile -print0 | ${XARGS} -0 \
106
		${REINPLACE_CMD} -e "s|^DESTDIR *=|& ${DESTDIR}|"
109
		${REINPLACE_CMD} -e "s|^DESTDIR *=|& ${DESTDIR}|"
110
.if defined(WITHOUT_NLS)
111
	@${REINPLACE_CMD} -e "s|#define HAVE_ICONV 1|#undef HAVE_ICONV|g" ${WRKSRC}/config.h
112
.endif
107
113
108
pre-build:
114
pre-build:
109
	@${ECHO_CMD} $$((${PORTREVISION}-1)) > ${WRKSRC}/.build
115
	@${ECHO_CMD} $$((${PORTREVISION}-1)) > ${WRKSRC}/.build
(-)files/patch-Makefile.in (-11 lines)
Removed Link Here
1
--- ./Makefile.in.orig	2010-05-10 21:44:45.000000000 +0200
2
+++ ./Makefile.in	2010-05-10 21:44:59.000000000 +0200
3
@@ -349,7 +349,7 @@
4
 LIBINTL_H = @LIBINTL_H@
5
 
6
 # libiconv
7
-LIBICONV = @LIBICONV@
8
+LIBICONV = -liconv
9
 
10
 # tests
11
 LIBINTL = @LIBINTL@

Return to bug 149981