1 files changed, 9 insertions, 31 deletions

diff --git a/shells/bash/Makefile b/shells/bash/Makefile
index f36c8b8a8015..c454259983bb 100644
--- a/shells/bash/Makefile
+++ b/shells/bash/Makefile
@@ -2,42 +2,30 @@
 # $FreeBSD$
 
 PORTNAME=		bash
-PATCHLEVEL=		46
-PORTVERSION=		4.3.${PATCHLEVEL:S/^0//g}
-PORTREVISION?=		1
+PORTVERSION=		4.4
+PORTREVISION?=		0
 CATEGORIES=		shells
 MASTER_SITES=		GNU/${PORTNAME}
-DISTNAME=		${PORTNAME}-${PORTVERSION:R}
 DIST_SUBDIR=		${PORTNAME}
 EXTRACT_ONLY=		${DISTNAME}${EXTRACT_SUFX}
 
-PATCH_SITES=		GNU/${PORTNAME}/${DISTNAME}-patches/ \
-			ftp://ftp.cwru.edu/pub/${PORTNAME}/${DISTNAME}-patches/
-PATCHFILES!=		/usr/bin/jot -s " " -w \
-			${PORTNAME}${PORTVERSION:R:S/.//g}-%03d \
-			${PATCHLEVEL} 1 ${PATCHLEVEL}
-
 MAINTAINER=		ehaupt@FreeBSD.org
-COMMENT=		The GNU Project's Bourne Again SHell
+COMMENT=		GNU Project's Bourne Again SHell
 
 LICENSE=		GPLv3
 
-OPTIONS_DEFINE=		IMPLICITCD COLONBREAKSWORDS HELP NLS STATIC SYSLOG DOCS
-OPTIONS_DEFINE+=	IMPORTFUNCTIONS
-OPTIONS_DEFAULT=	IMPLICITCD COLONBREAKSWORDS HELP
-IMPLICITCD_DESC=	Use directory name alone to cd into it
+OPTIONS_DEFINE=		COLONBREAKSWORDS HELP NLS STATIC SYSLOG DOCS
 COLONBREAKSWORDS_DESC=	Colons break words
 HELP_DESC=		Enable builtin help
-IMPORTFUNCTIONS_DESC=	Import function from env without --import-functions
 
-USES=			bison cpe iconv makeinfo
+OPTIONS_DEFAULT=	COLONBREAKSWORDS HELP
+
+USES=			bison cpe iconv makeinfo pathfix
+GNU_CONFIGURE=		yes
 OPTIONS_SUB=		yes
 CPE_VENDOR=		gnu
 
-IMPLICITCD_EXTRA_PATCHES=	${PATCHDIR}/extrapatch-implicitcd
 COLONBREAKSWORDS_EXTRA_PATCHES=	${PATCHDIR}/extrapatch-colonbreakswords
-# Always apply this for now. The option will modify the default.
-EXTRA_PATCHES+=			${PATCHDIR}/extrapatch-import-functions
 
 HELP_CONFIGURE_ENABLE=	help-builtin
 NLS_CONFIGURE_ENABLE=	nls
@@ -45,8 +33,6 @@ NLS_USES=		gettext
 
 INFO=			bash
 
-GNU_CONFIGURE=		yes
-
 PORTDOCS=		FAQ INTRO CHANGES COMPAT NEWS POSIX RBASH README \
 			bash.html bashref.html
 
@@ -55,8 +41,6 @@ CONFIGURE_ARGS+=	--without-bash-malloc \
 			--enable-disabled-builtins \
 			--with-libiconv-prefix=${ICONV_PREFIX}
 
-CFLAGS+=		-DUSE_MKTEMP=1 -DUSE_MKSTEMP=1
-
 .if empty(PKGNAMESUFFIX)
 CONFLICTS+=		bash-static-[0-9]*
 .else
@@ -65,12 +49,6 @@ CONFLICTS+=		bash-[0-9]*
 
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MIMPORTFUNCTIONS}
-CFLAGS+=	-DIMPORT_FUNCTIONS_DEF=1
-.else
-CFLAGS+=	-DIMPORT_FUNCTIONS_DEF=0
-.endif
-
 .if ${PORT_OPTIONS:MSTATIC} || defined(NO_DYNAMICROOT) || (defined(NOSHARED) && ${NOSHARED:tl} != "no")
 CONFIGURE_ARGS+=	--enable-static-link
 .else
@@ -118,7 +96,7 @@ cklatest:
 	@${ECHO} -n "Currently at: "
 	@${MAKE} -V PATCHLEVEL
 	-ncftpls \
-            ftp://ftp.gnu.org/gnu/${PORTNAME}/${PORTNAME}-${PORTVERSION:C/\.[0-9a-z]*$//}-patches/ \
+		ftp://ftp.gnu.org/gnu/${PORTNAME}/${PORTNAME}-${PORTVERSION}-patches/ \
 		| fgrep -v .sig | ${TAIL}
 
 .include <bsd.port.mk>