[Midnightbsd-cvs] mports [23738] trunk/shells/bash/Makefile: fix build on current.

[laffer1 at midnightbsd.org]

Revision: 23738
          http://svnweb.midnightbsd.org/mports/?rev=23738
Author:   laffer1
Date:     2018-08-18 13:02:12 -0400 (Sat, 18 Aug 2018)
Log Message:
-----------
fix build on current.

Modified Paths:
--------------
    trunk/shells/bash/Makefile

Modified: trunk/shells/bash/Makefile
===================================================================
--- trunk/shells/bash/Makefile	2018-08-18 16:52:36 UTC (rev 23737)
+++ trunk/shells/bash/Makefile	2018-08-18 17:02:12 UTC (rev 23738)
@@ -3,9 +3,9 @@
 PORTNAME=		bash
 PATCHLEVEL=		23
 PORTVERSION=		4.4.${PATCHLEVEL:S/^0//g}
-PORTREVISION?=		0
+PORTREVISION?=		1
 CATEGORIES=		shells
-MASTER_SITES=		GNU/${PORTNAME}
+MASTER_SITES=		GNU
 DISTNAME=		${PORTNAME}-${PORTVERSION:R}
 DIST_SUBDIR=		${PORTNAME}
 EXTRACT_ONLY=		${DISTNAME}${EXTRACT_SUFX}
@@ -26,7 +26,7 @@
 COLONBREAKSWORDS_DESC=	Colons break words
 HELP_DESC=		Enable builtin help
 
-USES=			bison cpe makeinfo pathfix
+USES=			bison cpe iconv makeinfo pathfix
 OPTIONS_SUB=		yes
 CPE_VENDOR=		gnu
 
@@ -34,7 +34,7 @@
 
 HELP_CONFIGURE_ENABLE=	help-builtin
 NLS_CONFIGURE_ENABLE=	nls
-NLS_USES=		gettext iconv
+NLS_USES=		gettext
 
 INFO=			bash
 
@@ -45,7 +45,9 @@
 
 CONFIGURE_ARGS+=	--without-bash-malloc \
 			--disable-rpath \
-			--enable-disabled-builtins
+			--enable-disabled-builtins \
+			--host=${ARCH}-portbld-freebsd10.4 \
+			--build=${ARCH}-portbld-freebsd10.4
 
 .if empty(PKGNAMESUFFIX)
 CONFLICTS+=		bash-static-[0-9]*
@@ -63,11 +65,12 @@
 
 .if ${PORT_OPTIONS:MSTATIC} || defined(NO_DYNAMICROOT) || (defined(NOSHARED) && ${NOSHARED:tl} != "no")
 CONFIGURE_ARGS+=	--enable-static-link
+LLD_UNSAFE=		yes
 .else
 CONFIGURE_ARGS+=	--disable-static-link
 # Bash symbols must be exported in order to link runtime plugins, i.e.,
 # "enable -f". (Plugins are not supported for bash-static.)
-CFLAGS+=		-Wl,-export-dynamic
+LDFLAGS+=		-Wl,-export-dynamic
 .endif
 
 post-patch:
@@ -96,12 +99,12 @@
 	@${ECHO_CMD} $$((${PORTREVISION}-1)) > ${WRKSRC}/.build
 
 post-install:
-	${LN} -sf bash ${STAGEDIR}${PREFIX}/bin/rbash
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${LN} -sf bash ${PREFIX}/bin/rbash
+	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/FAQ \
-		${WRKSRC}/doc/INTRO ${STAGEDIR}${DOCSDIR}
+		${WRKSRC}/doc/INTRO ${DOCSDIR}
 	for d in ${PORTDOCS:NFAQ:NINTRO:N*html}; do \
-		${INSTALL_DATA} ${WRKSRC}/$${d} ${STAGEDIR}${DOCSDIR}; \
+		${INSTALL_DATA} ${WRKSRC}/$${d} ${DOCSDIR}; \
 	done
 
 regress: build