2 files changed, 10 insertions, 106 deletions

diff --git a/shells/bash-devel/Makefile b/shells/bash-devel/Makefile
index c86a4a47cf98..453fcc0025ac 100644
--- a/shells/bash-devel/Makefile
+++ b/shells/bash-devel/Makefile
@@ -4,13 +4,12 @@
 PORTNAME=		bash
 PATCHLEVEL=		42
 PORTVERSION=		4.2.${PATCHLEVEL:S/^0//g}
-PORTREVISION?=		0
+PORTREVISION?=		1
 CATEGORIES=		shells
-MASTER_SITES=		${MASTER_SITE_GNU:S/$/:bash/} \
-			ftp://ftp.cwru.edu/pub/%SUBDIR%/:faq
-MASTER_SITE_SUBDIR=	${PORTNAME}/:bash,faq
+MASTER_SITES=		GNU
+MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTNAME=		${PORTNAME}-${PORTVERSION:R}
-DISTFILES=		${DISTNAME}${EXTRACT_SUFX}:bash
+DISTFILES=		${DISTNAME}${EXTRACT_SUFX}
 DIST_SUBDIR=		${PORTNAME}
 EXTRACT_ONLY=		${DISTNAME}${EXTRACT_SUFX}
 
@@ -24,14 +23,11 @@ PATCHFILES!=		/usr/bin/jot -s " " -w \
 MAINTAINER=		ehaupt@FreeBSD.org
 COMMENT=		The GNU Project's Bourne Again SHell
 
-IGNOREFILES=		FAQ
-
 OPTIONS_DEFINE=	IMPLICITCD COLONBREAKSWORDS HELP NLS STATIC SYSLOG DOCS
 OPTIONS_DEFAULT=IMPLICITCD COLONBREAKSWORDS HELP NLS
 IMPLICITCD_DESC=	Use directory name alone to cd into it
 COLONBREAKSWORDS_DESC=	Colons break words
-HELP_DESC=		Install the help files
-SYSLOG_DESC=		Compile with syslog support
+HELP_DESC=		Enable builtin help
 
 .include <bsd.port.pre.mk>
 
@@ -51,9 +47,6 @@ GNU_CONFIGURE=		yes
 USE_BISON=		build
 
 .if ${PORT_OPTIONS:MDOCS}
-.if !defined(WITH_INCLUDED_FAQ)
-DISTFILES+=		FAQ:faq
-.endif
 PORTDOCS=		FAQ INTRO CHANGES COMPAT NEWS POSIX RBASH
 .endif
 
@@ -62,26 +55,19 @@ CONFIGURE_ARGS=		--without-bash-malloc \
 			--enable-disabled-builtins
 
 .if ${PORT_OPTIONS:MSTATIC} || defined(NO_DYNAMICROOT) || (defined(NOSHARED) && ${NOSHARED:L} != "no")
-.if empty(PORT_OPTIONS:MNLS)
-WITHOUT_NLS=yes
-.endif
+#.if empty(PORT_OPTIONS:MNLS)
+#.endif
 CONFIGURE_ARGS+=	--enable-static-link
-PKGNAMESUFFIX=	-static-devel
-CONFLICTS+=	bash-[0-9]* bash-static-[0-9]* bash-devel-[0-9]*
+PKGNAMESUFFIX=		-static-devel
+CONFLICTS+=		bash-[0-9]* bash-static-[0-9]* bash-devel-[0-9]*
 .else
 CONFIGURE_ARGS+=	--enable-static-link=no
 PKGNAMESUFFIX=		-devel
-CONFLICTS+=	bash-static-[0-9]* bash-[0-9]* bash-static-devel-[0-9]*
+CONFLICTS+=		bash-static-[0-9]* bash-[0-9]* bash-static-devel-[0-9]*
 .endif
 
 .if empty(PORT_OPTIONS:MHELP)
 CONFIGURE_ARGS+=	--disable-help-builtin
-PLIST_SUB+=		HELP="@comment "
-.elif defined(WITH_INTEGRATED_HELPFILES)
-PLIST_SUB+=		HELP="@comment "
-.else
-CONFIGURE_ARGS+=	--enable-separate-helpfiles
-PLIST_SUB+=		HELP=""
 .endif
 
 .if empty(PORT_OPTIONS:MNLS)
@@ -128,13 +114,8 @@ post-install:
 	@cd ${PREFIX}/bin ; ${LN} -sf bash rbash
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
-.if !defined(WITH_INCLUDED_FAQ)
-	@${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/FAQ \
-		${WRKSRC}/doc/INTRO ${DOCSDIR}
-.else
 	@${INSTALL_DATA} ${WRKSRC}/doc/FAQ \
 		${WRKSRC}/doc/INTRO ${DOCSDIR}
-.endif
 	@for d in ${PORTDOCS:NFAQ:NINTRO}; do \
 		${INSTALL_DATA} ${WRKSRC}/$${d} ${DOCSDIR}; \
 	done
diff --git a/shells/bash-devel/pkg-plist b/shells/bash-devel/pkg-plist
index adcd3062adbe..259577d23db5 100644
--- a/shells/bash-devel/pkg-plist
+++ b/shells/bash-devel/pkg-plist
@@ -2,83 +2,6 @@
 bin/bash
 bin/rbash
 bin/bashbug
-%%HELP%%%%DATADIR%%/alias
-%%HELP%%%%DATADIR%%/arith
-%%HELP%%%%DATADIR%%/arith_for
-%%HELP%%%%DATADIR%%/bg
-%%HELP%%%%DATADIR%%/bind
-%%HELP%%%%DATADIR%%/break
-%%HELP%%%%DATADIR%%/builtin
-%%HELP%%%%DATADIR%%/caller
-%%HELP%%%%DATADIR%%/case
-%%HELP%%%%DATADIR%%/cd
-%%HELP%%%%DATADIR%%/colon
-%%HELP%%%%DATADIR%%/command
-%%HELP%%%%DATADIR%%/compgen
-%%HELP%%%%DATADIR%%/complete
-%%HELP%%%%DATADIR%%/compopt
-%%HELP%%%%DATADIR%%/conditional
-%%HELP%%%%DATADIR%%/continue
-%%HELP%%%%DATADIR%%/coproc
-%%HELP%%%%DATADIR%%/declare
-%%HELP%%%%DATADIR%%/dirs
-%%HELP%%%%DATADIR%%/disown
-%%HELP%%%%DATADIR%%/dot
-%%HELP%%%%DATADIR%%/echo
-%%HELP%%%%DATADIR%%/enable
-%%HELP%%%%DATADIR%%/eval
-%%HELP%%%%DATADIR%%/exec
-%%HELP%%%%DATADIR%%/exit
-%%HELP%%%%DATADIR%%/export
-%%HELP%%%%DATADIR%%/false
-%%HELP%%%%DATADIR%%/fc
-%%HELP%%%%DATADIR%%/fg
-%%HELP%%%%DATADIR%%/fg_percent
-%%HELP%%%%DATADIR%%/for
-%%HELP%%%%DATADIR%%/function
-%%HELP%%%%DATADIR%%/getopts
-%%HELP%%%%DATADIR%%/grouping_braces
-%%HELP%%%%DATADIR%%/hash
-%%HELP%%%%DATADIR%%/help
-%%HELP%%%%DATADIR%%/history
-%%HELP%%%%DATADIR%%/if
-%%HELP%%%%DATADIR%%/jobs
-%%HELP%%%%DATADIR%%/kill
-%%HELP%%%%DATADIR%%/let
-%%HELP%%%%DATADIR%%/local
-%%HELP%%%%DATADIR%%/logout
-%%HELP%%%%DATADIR%%/mapfile
-%%HELP%%%%DATADIR%%/popd
-%%HELP%%%%DATADIR%%/printf
-%%HELP%%%%DATADIR%%/pushd
-%%HELP%%%%DATADIR%%/pwd
-%%HELP%%%%DATADIR%%/read
-%%HELP%%%%DATADIR%%/readarray
-%%HELP%%%%DATADIR%%/readonly
-%%HELP%%%%DATADIR%%/return
-%%HELP%%%%DATADIR%%/select
-%%HELP%%%%DATADIR%%/set
-%%HELP%%%%DATADIR%%/shift
-%%HELP%%%%DATADIR%%/shopt
-%%HELP%%%%DATADIR%%/source
-%%HELP%%%%DATADIR%%/suspend
-%%HELP%%%%DATADIR%%/test
-%%HELP%%%%DATADIR%%/test_bracket
-%%HELP%%%%DATADIR%%/time
-%%HELP%%%%DATADIR%%/times
-%%HELP%%%%DATADIR%%/trap
-%%HELP%%%%DATADIR%%/true
-%%HELP%%%%DATADIR%%/type
-%%HELP%%%%DATADIR%%/typeset
-%%HELP%%%%DATADIR%%/ulimit
-%%HELP%%%%DATADIR%%/umask
-%%HELP%%%%DATADIR%%/unalias
-%%HELP%%%%DATADIR%%/unset
-%%HELP%%%%DATADIR%%/until
-%%HELP%%%%DATADIR%%/variable_help
-%%HELP%%%%DATADIR%%/wait
-%%HELP%%%%DATADIR%%/while
-%%HELP%%@dirrm %%DATADIR%%
 %%NLS%%share/locale/af/LC_MESSAGES/bash.mo
 %%NLS%%share/locale/bg/LC_MESSAGES/bash.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/bash.mo