Update lang/perl58 to 5.8.1. Changes from version 5.8.0nb2 include:

* Hash Randomisation
* UTF-8 On Filehandles No Longer Activated By Locale
* Single-number v-strings are no longer v-strings before "=>"
* UTF-8 no longer default under UTF-8 locales
* Unsafe signals again available

9 files changed, 122 insertions, 174 deletions

diff --git a/lang/perl58/Makefile b/lang/perl58/Makefile
index a505ff95c58..55921a3698e 100644
--- a/lang/perl58/Makefile
+++ b/lang/perl58/Makefile
@@ -1,22 +1,33 @@
-# $NetBSD: Makefile,v 1.20 2003/09/17 19:40:43 grant Exp $
+# $NetBSD: Makefile,v 1.21 2003/10/05 07:07:14 jlam Exp $
 
+# The following two variables should have empty values unless we're
+# building a perl snapshot or release candidate.
+#
 PERL5_SNAPSHOT=	# empty
-PERL5_VERS=	5.8.0
+PERL5_RC_VERS=	# empty
 
-.if empty(PERL5_SNAPSHOT)
+.if empty(PERL5_SNAPSHOT) && empty(PERL5_RC_VERS)
 DISTNAME=	perl-${PERL5_VERS}
+PKGREVISION=	# empty
 SNAPSHOT_SITES=	# empty
 .else
+.  if !empty(PERL5_SNAPSHOT)
 DISTNAME=	perl@${PERL5_SNAPSHOT}
-PKGNAME=	perl-${PERL5_VERS}
+PKGNAME=	perl-${PERL5_VERS}beta${PERL5_SNAPSHOT}
 SNAPSHOT_SITES=	http://www.iki.fi/jhi/
+EXTRACT_SUFX=	.tbz
+WRKSRC=		${WRKDIR}/perl
+.  else # !empty(PERL5_RC_VERS)
+DISTNAME=	perl-${PERL5_VERS}-RC${PERL5_RC_VERS}
+PKGNAME=	perl-${PERL5_VERS}rc${PERL5_RC_VERS}
+SNAPSHOT_SITES=	http://www.cpan.org/authors/id/J/JH/JHI/
+.  endif
 .endif
 
-PKGREVISION=	2
+PERL5_VERS=	5.8.1
 CATEGORIES=	lang devel perl5
 MASTER_SITES=	${SNAPSHOT_SITES} \
-		ftp://ftp.funet.fi/pub/languages/perl/CPAN/src/ \
-		ftp://ftp.ruhr-uni-bochum.de/mirrors/ftp.funet.fi/pub/languages/perl/CPAN/src/
+		${MASTER_SITE_PERL_CPAN:S,/modules/by-module/$,/src/,}
 
 MAINTAINER=	jlam@NetBSD.org
 HOMEPAGE=	http://www.perl.com/
@@ -36,7 +47,6 @@ CONFIGURE_ARGS+=	-Dprefix="${PREFIX}"
 CONFIGURE_ARGS+=	-Dscriptdir="${PREFIX}/bin"
 CONFIGURE_ARGS+=	-Darchname="${MACHINE_ARCH}-${LOWER_OPSYS}"
 CONFIGURE_ARGS+=	-Doptimize="${CFLAGS}"
-CONFIGURE_ARGS+=	-Dcc="${CC:T}"
 CONFIGURE_ARGS+=	-Dinstallstyle="lib/perl5"
 CONFIGURE_ARGS+=	-Ui_malloc
 CONFIGURE_ARGS+=	-Uusemymalloc
@@ -51,12 +61,28 @@ TEST_TARGET=		test
 #
 CONFIGURE_ARGS+=	-Dman3ext="3"
 CONFIGURE_ARGS+=	-Dman3dir="${PERL5_PRIVLIB}/man/man3"
-CONFIGURE_ARGS+=	-Dinstallsiteman3dir="${PERL5_SITEPERL}/man/man3"
+CONFIGURE_ARGS+=	-Dsiteman3dir="${PERL5_SITEPERL}/man/man3"
+
+# The site directories are all relative to the perl view.
+CONFIGURE_ARGS+=	-Dsiteprefix="${VIEWBASE}"
+CONFIGURE_ARGS+=	-Dinstallsiteman1dir="${VIEWBASE}/man/man1"
 
 .include "../../mk/bsd.prefs.mk"
 
 MKPIC?=		yes
 
+.if ${OPSYS} == "IRIX"
+.  if ${ABI} == "32"
+PERL5_CC=		${CC:T} -n32
+.  elif ${ABI} == "64"
+PERL5_CC=		${CC:T} -64
+CONFIGURE_ARGS+=	-Duse64bitint
+.  endif
+.else
+PERL5_CC=		${CC:T}
+.endif
+CONFIGURE_ARGS+=	-Dcc="${PERL5_CC}"
+
 .if ${OPSYS} == "Darwin"
 #
 # The perl build attempts to work around case-insensitivity problems on
@@ -83,6 +109,7 @@ PERL5_SITEARCH=	${PREFIX}/lib/perl5/site_perl/${PERL5_VERS}/${LOWER_OPSYS}
 #
 LIBSWANTED.Darwin=	m c
 LIBSWANTED.FreeBSD=	m crypt
+LIBSWANTED.IRIX=	m crypt
 LIBSWANTED.NetBSD=	m crypt
 LIBSWANTED.SunOS=	m crypt dl socket nsl
 
@@ -141,8 +168,9 @@ CONFIGURE_ARGS+=	-Duseshrplib
 PERL5=			${PREFIX}/bin/perl${PERL5_VERS}
 PERL5_PRIVLIB?=		${PREFIX}/lib/perl5/${PERL5_VERS}
 PERL5_ARCHLIB?=		${PREFIX}/lib/perl5/${PERL5_VERS}/${MACHINE_ARCH}-${LOWER_OPSYS}
-PERL5_SITEPERL?=	${PREFIX}/lib/perl5/site_perl
-PERL5_SITEARCH?=	${PREFIX}/lib/perl5/site_perl/${PERL5_VERS}/${MACHINE_ARCH}-${LOWER_OPSYS}
+PERL5_SITEPERL?=	${VIEWBASE}/lib/perl5/site_perl
+PERL5_SITELIB?=		${VIEWBASE}/lib/perl5/site_perl/${PERL5_VERS}
+PERL5_SITEARCH?=	${VIEWBASE}/lib/perl5/site_perl/${PERL5_VERS}/${MACHINE_ARCH}-${LOWER_OPSYS}
 PERL5_PACKLIST=		${PERL5_ARCHLIB}/.packlist
 PLIST_SUBST+=		PERL5_SITEPERL=${PERL5_SITEPERL:S/^${PREFIX}\///}
 
@@ -187,27 +215,28 @@ STATIC_PERL?=		NO
 .endif
 STATIC_PERL?=		YES
 
+WRKSRC_PERL5=		${WRKSRC}/perl
+
 .if defined(STATIC_PERL) && ${STATIC_PERL} == "YES"
 STATIC_WRKDIR=		${WRKDIR}/static
 STATIC_MAKEFLAGS=	MKPIC=no STATIC_PERL=NO
 STATIC_MAKEFLAGS+=	WRKDIR=${STATIC_WRKDIR}
 STATIC_MAKEFLAGS+=	ALL_TARGET=perl
+WRKSRC_PERL5=		${STATIC_WRKDIR}/${WRKSRC:T}/perl
 
 post-build:
 	cd ${.CURDIR} && ${MAKE} build ${STATIC_MAKEFLAGS}
 .endif
 
 post-install:
-.if defined(STATIC_PERL) && ${STATIC_PERL} == "YES"
-	${RM} -f ${PERL5}
-	${INSTALL_PROGRAM} ${STATIC_WRKDIR}/${WRKSRC:T}/perl ${PERL5}
-.endif
-	${RM} -f ${PREFIX}/bin/perl
-	${LN} -f ${PERL5} ${PREFIX}/bin/perl
-	strip ${PERL5}
+	${RM} -f ${PREFIX}/bin/perl ${PREFIX}/bin/perl${PERL5_VERS}
+	${INSTALL_PROGRAM} ${WRKSRC_PERL5} ${PREFIX}/bin/perl${PERL5_VERS}
+	${LN} -f ${PREFIX}/bin/perl${PERL5_VERS} ${PREFIX}/bin/perl
+.if !empty(_STRIPFLAG_INSTALL)
 	if [ -x ${PREFIX}/bin/a2p ]; then				\
 		strip ${PREFIX}/bin/a2p;				\
 	fi
+.endif
 	${RMDIR} -p ${PERL5_SITEARCH} 2>/dev/null || ${TRUE}
 	${RM} -f ${WRKDIR}/bsd.perl.mk
 	eval `${PERL5} -V:installsitelib 2>/dev/null` && \
@@ -219,8 +248,4 @@ post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/mk
 	${INSTALL_DATA} ${WRKDIR}/bsd.perl.mk ${PREFIX}/share/mk/bsd.perl.mk
 
-.if ${MACHINE_ARCH} == "alpha"
-USE_PKGSRC_GCC=		# defined
-.endif
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/perl58/PLIST b/lang/perl58/PLIST
index 64fd4e201f4..bb66de6211c 100644
--- a/lang/perl58/PLIST
+++ b/lang/perl58/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2003/07/18 13:01:52 wiz Exp $
+@comment $NetBSD: PLIST,v 1.7 2003/10/05 07:07:14 jlam Exp $
 man/man1/psed.1
 man/man1/pstruct.1
 share/mk/bsd.perl.mk
diff --git a/lang/perl58/distinfo b/lang/perl58/distinfo
index 57d8d6132d1..e2a5513d8b9 100644
--- a/lang/perl58/distinfo
+++ b/lang/perl58/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.7 2003/09/10 12:13:19 jlam Exp $
+$NetBSD: distinfo,v 1.8 2003/10/05 07:07:14 jlam Exp $
 
-SHA1 (perl-5.8.0.tar.gz) = be1e05876ca734464f8a770d61b1f15cca555719
-Size (perl-5.8.0.tar.gz) = 11023084 bytes
-SHA1 (patch-aa) = e140f42f27fe4e2fd3786cd2c6277571b5ffd483
-SHA1 (patch-ab) = bad183d11b04811c3cf47501537e92750cc4e5e5
-SHA1 (patch-ac) = 8596389f77a6eafea7817e19c46165c1a34fdda6
-SHA1 (patch-ae) = 7bb2f96693cef5b4008a02fde2bde5ae1ce73cb6
-SHA1 (patch-ah) = 39d007da11f28ab37a81b7403b92be2784e942c6
+SHA1 (perl-5.8.1.tar.gz) = 838a2f55927d14a9c8f239ebd8f40e33572f2800
+Size (perl-5.8.1.tar.gz) = 11857808 bytes
+SHA1 (patch-ab) = cdceb712bae08c6041e5aa175e5989d48b3a3f4e
+SHA1 (patch-ae) = fa3bbb1561192ce9214a7a7c756ccb2595a52c80
+SHA1 (patch-ah) = 2bfaf2503589ae3dbedaf7ee61561ed58054938e
+SHA1 (patch-zc) = eb81edd1144ec46285898afc641c03a3aad54977
diff --git a/lang/perl58/patches/patch-aa b/lang/perl58/patches/patch-aa
deleted file mode 100644
index df97d2f3a9d..00000000000
--- a/lang/perl58/patches/patch-aa
+++ /dev/null
@@ -1,58 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2003/05/27 21:57:26 jlam Exp $
-
---- Configure.orig	Thu Jul 18 18:55:15 2002
-+++ Configure	Tue May 27 16:31:15 2003
-@@ -1049,6 +1049,8 @@
- sitelib=''
- sitelib_stem=''
- sitelibexp=''
-+installsiteman1dir=''
-+installsiteman3dir=''
- siteprefix=''
- siteprefixexp=''
- sizesize=''
-@@ -7950,6 +7952,17 @@
- 	;;
- esac
- 
-+case "$installsiteman1dir" in
-+'')	dflt="$installman1dir" ;;
-+*)	dflt="$installsiteman1dir" ;;
-+esac
-+set installsiteman1dir installsiteman1dir none
-+eval $prefixit
-+fn=d~+
-+rp="Where do the site-specific manual pages (source) go?"
-+. ./getfile
-+installsiteman1dir="$ans"
-+
- : see if we can have long filenames
- echo " "
- first=123456789abcdef
-@@ -8074,6 +8087,17 @@
- 	;;
- esac
- 
-+case "$installsiteman3dir" in
-+'')	dflt="$installman3dir" ;;
-+*)	dflt="$installsiteman3dir" ;;
-+esac
-+set installsiteman3dir installsiteman3dir none
-+eval $prefixit
-+fn=d~+
-+rp="Where do the site-specific library man pages (source) go?"
-+. ./getfile
-+installsiteman3dir="$ans"
-+
- : see if we have to deal with yellow pages, now NIS.
- if $test -d /usr/etc/yp || $test -d /etc/yp || $test -d /usr/lib/yp; then
- 	if $test -f /usr/etc/nibindd; then
-@@ -20285,6 +20309,8 @@
- installsitearch='$installsitearch'
- installsitebin='$installsitebin'
- installsitelib='$installsitelib'
-+installsiteman1dir='$installsiteman1dir'
-+installsiteman3dir='$installsiteman3dir'
- installstyle='$installstyle'
- installusrbinperl='$installusrbinperl'
- installvendorarch='$installvendorarch'
diff --git a/lang/perl58/patches/patch-ab b/lang/perl58/patches/patch-ab
index 5a2e48bb299..a7e9a4d2048 100644
--- a/lang/perl58/patches/patch-ab
+++ b/lang/perl58/patches/patch-ab
@@ -1,44 +1,11 @@
-$NetBSD: patch-ab,v 1.3 2003/09/10 12:13:19 jlam Exp $
+$NetBSD: patch-ab,v 1.4 2003/10/05 07:07:14 jlam Exp $
 
---- hints/netbsd.sh.orig	Sat Jun  1 13:03:12 2002
-+++ hints/netbsd.sh	Wed Sep 10 08:10:38 2003
-@@ -37,16 +37,21 @@
- 		cccdlflags="-DPIC -fPIC $cccdlflags"
- 		lddlflags="--whole-archive -shared $lddlflags"
- 		rpathflag="-Wl,-rpath,"
--		#
--		# Include the whole libgcc.a into the perl executable so
--		# that certain symbols needed by loadable modules built as
--		# C++ objects (__eh_alloc, __pure_virtual, etc.) will always
--		# be defined.
--		#
--		# XXX This should be obsoleted by gcc-3.0.
--		#
--		ccdlflags="-Wl,-whole-archive -lgcc -Wl,-no-whole-archive \
--			-Wl,-E $ccdlflags"
-+		case "$osvers" in
-+		1.[0-5]|1.[0-5].*)
-+			#
-+			# Include the whole libgcc.a into the perl executable
-+			# so that certain symbols needed by loadable modules
-+			# built as C++ objects (__eh_alloc, __pure_virtual,
-+			# etc.) will always be defined.
-+			#
-+			ccdlflags="-Wl,-whole-archive -lgcc \
-+				-Wl,-no-whole-archive -Wl,-E $ccdlflags"
-+			;;
-+		*)
-+			ccdlflags="-Wl,-E $ccdlflags"
-+			;;
-+		esac
- 	elif test -f /usr/libexec/ld.so; then
- 		# a.out
- 		d_dlopen=$define
-@@ -127,20 +132,3 @@
-         ;; 
+--- hints/netbsd.sh.orig	Tue Jul  1 23:49:58 2003
++++ hints/netbsd.sh	Wed Jul  2 11:49:17 2003
+@@ -133,23 +133,6 @@
  esac 
  EOCBU
--
+ 
 -# Set sensible defaults for NetBSD: look for local software in
 -# /usr/pkg (NetBSD Packages Collection) and in /usr/local.
 -#
@@ -55,3 +22,7 @@ $NetBSD: patch-ab,v 1.3 2003/09/10 12:13:19 jlam Exp $
 -	done
 -	;;
 -esac
+-
+ case `uname -m` in
+ alpha)
+     echo 'int main() {}' > try.c
diff --git a/lang/perl58/patches/patch-ac b/lang/perl58/patches/patch-ac
deleted file mode 100644
index 322990aa657..00000000000
--- a/lang/perl58/patches/patch-ac
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2003/02/21 16:10:27 grant Exp $
-
---- hints/freebsd.sh.orig	Sun Jun  2 03:03:12 2002
-+++ hints/freebsd.sh
-@@ -98,6 +98,13 @@ case "$osvers" in
- 	        ;;
- 	esac
- 	libswanted=`echo $libswanted | sed 's/ malloc / /'`
-+ 	libswanted=`echo $libswanted | sed 's/ bind / /'`
-+	libswanted=`echo $libswanted | sed 's/ iconv / /'`
-+	d_setregid='define'
-+	d_setreuid='define'
-+	d_setegid='define'
-+	d_seteuid='define'
-+	d_dosuid='define'
- 	;;
- esac
- 
-@@ -124,7 +131,7 @@ case "$osvers" in
-             fi
-             lddlflags='-Bshareable'
-         fi
--        cccdlflags='-DPIC -fpic'
-+        cccdlflags='-DPIC -fPIC'
-         ;;
- esac
- 
diff --git a/lang/perl58/patches/patch-ae b/lang/perl58/patches/patch-ae
index 11c785f63ba..760dfb7b4c0 100644
--- a/lang/perl58/patches/patch-ae
+++ b/lang/perl58/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.1 2003/02/21 16:10:27 grant Exp $
+$NetBSD: patch-ae,v 1.2 2003/10/05 07:07:14 jlam Exp $
 
---- makedepend.SH.orig	Wed Jul 10 00:06:42 2002
+--- makedepend.SH.orig	Fri Jun  6 23:34:20 2003
 +++ makedepend.SH
-@@ -79,6 +79,7 @@ if test -f Makefile; then
+@@ -84,6 +84,7 @@
      case "$osname" in
      os2) ;;
      netbsd) ;;
diff --git a/lang/perl58/patches/patch-ah b/lang/perl58/patches/patch-ah
index 3155a8983af..08511c5f767 100644
--- a/lang/perl58/patches/patch-ah
+++ b/lang/perl58/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.2 2003/02/21 16:10:27 grant Exp $
+$NetBSD: patch-ah,v 1.3 2003/10/05 07:07:14 jlam Exp $
 
---- perl.c.orig	Wed Jul 10 05:41:43 2002
-+++ perl.c
-@@ -3673,12 +3673,32 @@ S_init_perllib(pTHX)
+--- perl.c.orig	Thu Sep 11 14:42:33 2003
++++ perl.c	Tue Sep 30 01:16:04 2003
+@@ -3943,12 +3943,33 @@
      }
  
  /* Use the ~-expanded versions of APPLLIB (undocumented),
@@ -10,56 +10,58 @@ $NetBSD: patch-ah,v 1.2 2003/02/21 16:10:27 grant Exp $
 +    SITEARCH SITELIB ARCHLIB PRIVLIB VENDORARCH and VENDORLIB
  */
  #ifdef APPLLIB_EXP
-     incpush(APPLLIB_EXP, TRUE, TRUE);
+     incpush(APPLLIB_EXP, TRUE, TRUE, TRUE);
  #endif
  
 +#ifdef SITEARCH_EXP
 +    /* sitearch is always relative to sitelib on Windows for
 +     * DLL-based path intuition to work correctly */
 +#  if !defined(WIN32)
-+    incpush(SITEARCH_EXP, FALSE, FALSE);
++    incpush(SITEARCH_EXP, FALSE, FALSE, TRUE);
 +#  endif
 +#endif
 +
 +#ifdef SITELIB_EXP
 +#  if defined(WIN32)
-+    incpush(SITELIB_EXP, TRUE, FALSE);	/* this picks up sitearch as well */
++    /* this picks up sitearch as well */
++    incpush(SITELIB_EXP, TRUE, FALSE, TRUE);
 +#  else
-+    incpush(SITELIB_EXP, FALSE, FALSE);
++    incpush(SITELIB_EXP, FALSE, FALSE, TRUE);
 +#  endif
 +#endif
 +
 +#ifdef SITELIB_STEM /* Search for version-specific dirs below here */
-+    incpush(SITELIB_STEM, FALSE, TRUE);
++    incpush(SITELIB_STEM, FALSE, TRUE, TRUE);
 +#endif
 +
  #ifdef ARCHLIB_EXP
-     incpush(ARCHLIB_EXP, FALSE, FALSE);
+     incpush(ARCHLIB_EXP, FALSE, FALSE, TRUE);
  #endif
-@@ -3710,26 +3730,6 @@ S_init_perllib(pTHX)
-     incpush(PRIVLIB_EXP, TRUE, FALSE);
+@@ -3980,27 +4001,6 @@
+     incpush(PRIVLIB_EXP, TRUE, FALSE, TRUE);
  #else
-     incpush(PRIVLIB_EXP, FALSE, FALSE);
+     incpush(PRIVLIB_EXP, FALSE, FALSE, TRUE);
 -#endif
 -
 -#ifdef SITEARCH_EXP
 -    /* sitearch is always relative to sitelib on Windows for
 -     * DLL-based path intuition to work correctly */
 -#  if !defined(WIN32)
--    incpush(SITEARCH_EXP, FALSE, FALSE);
+-    incpush(SITEARCH_EXP, FALSE, FALSE, TRUE);
 -#  endif
 -#endif
 -
 -#ifdef SITELIB_EXP
 -#  if defined(WIN32)
--    incpush(SITELIB_EXP, TRUE, FALSE);	/* this picks up sitearch as well */
+-    /* this picks up sitearch as well */
+-    incpush(SITELIB_EXP, TRUE, FALSE, TRUE);
 -#  else
--    incpush(SITELIB_EXP, FALSE, FALSE);
+-    incpush(SITELIB_EXP, FALSE, FALSE, TRUE);
 -#  endif
 -#endif
 -
 -#ifdef SITELIB_STEM /* Search for version-specific dirs below here */
--    incpush(SITELIB_STEM, FALSE, TRUE);
+-    incpush(SITELIB_STEM, FALSE, TRUE, TRUE);
  #endif
  
  #ifdef PERL_VENDORARCH_EXP
diff --git a/lang/perl58/patches/patch-zc b/lang/perl58/patches/patch-zc
new file mode 100644
index 00000000000..71fa43a9ef1
--- /dev/null
+++ b/lang/perl58/patches/patch-zc
@@ -0,0 +1,36 @@
+$NetBSD: patch-zc,v 1.1 2003/10/05 07:07:14 jlam Exp $
+
+--- Policy_sh.SH.orig	Fri Aug  1 05:23:23 2003
++++ Policy_sh.SH	Tue Aug 26 02:12:12 2003
+@@ -184,11 +184,11 @@
+ 	;;
+     sitearch)	dflt="$sitelib/$archname" ;;
+ 
+-    siteman1)	dflt="$siteprefix/man/man1" ;;
+-    siteman3)	dflt="$siteprefix/man/man3" ;;
++    siteman1dir)	dflt="$siteprefix/man/man1" ;;
++    siteman3dir)	dflt="$siteprefix/man/man3" ;;
+     # We don't know what to do with these yet.
+-    sitehtml1)	dflt='' ;;
+-    sitehtm31dir)	dflt='' ;;
++    sitehtml1dir)	dflt='' ;;
++    sitehtml1dir)	dflt='' ;;
+     
+     # Directories for vendor-supplied add-on files
+     # These are all usually empty.
+@@ -213,11 +213,11 @@
+ 		;;
+ 	    vendorarch)	dflt="$vendorlib/$archname" ;;
+ 
+-	    vendorman1)	dflt="$vendorprefix/man/man1" ;;
+-	    vendorman3)	dflt="$vendorprefix/man/man3" ;;
++	    vendorman1dir)	dflt="$vendorprefix/man/man1" ;;
++	    vendorman3dir)	dflt="$vendorprefix/man/man3" ;;
+ 	    # We don't know what to do with these yet.
+-	    vendorhtml1)	dflt='' ;;
+-	    vendorhtm3)	dflt='' ;;
++	    vendorhtml1dir)	dflt='' ;;
++	    vendorhtml3dir)	dflt='' ;;
+ 
+ 	    esac  # End of vendorprefix != ''
+ 	fi