From 82e5b6ca62c7a12fd8f2a19cefd9bb65bf3e436d Mon Sep 17 00:00:00 2001
From: beech <beech@FreeBSD.org>
Date: Fri, 21 Dec 2007 20:22:39 +0000
Subject: - Make NLS patch conditional. - "isspace" bug is fixed in 7.x up. -
 Bump portrevision.

Approved by:	linimon (mentor)
---
 www/horde-base/Makefile                            |  6 +++++-
 www/horde-base/files/extra-patch-lib_Horde_NLS.php | 13 +++++++++++++
 www/horde-base/files/patch-lib_Horde_NLS.php       | 13 -------------
 3 files changed, 18 insertions(+), 14 deletions(-)
 create mode 100644 www/horde-base/files/extra-patch-lib_Horde_NLS.php
 delete mode 100644 www/horde-base/files/patch-lib_Horde_NLS.php

(limited to 'www/horde-base')

diff --git a/www/horde-base/Makefile b/www/horde-base/Makefile
index e30bbd29cb56..9ba6670aac32 100644
--- a/www/horde-base/Makefile
+++ b/www/horde-base/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	horde
 DISTVERSIONPREFIX=
 DISTVERSION=	3.1.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www
 PKGNAMEPREFIX=
 PKGNAMESUFFIX=	-base
@@ -199,6 +199,10 @@ PORTDOCS=	README CHANGES CODING_STANDARDS CONTRIBUTING CREDITS HACKING INSTALL \
 
 .include <bsd.port.pre.mk>
 
+.if ${OSVERSION} < 700000
+EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-lib_Horde_NLS.php
+.endif
+
 .if ${PHP_VER} == 5
 USE_PHP+=	dom
 .else
diff --git a/www/horde-base/files/extra-patch-lib_Horde_NLS.php b/www/horde-base/files/extra-patch-lib_Horde_NLS.php
new file mode 100644
index 000000000000..4404276773d0
--- /dev/null
+++ b/www/horde-base/files/extra-patch-lib_Horde_NLS.php
@@ -0,0 +1,13 @@
+--- lib/Horde/NLS.php.orig	2007-09-29 07:22:46.000000000 -0800
++++ lib/Horde/NLS.php	2007-12-18 11:16:03.000000000 -0900
+@@ -119,6 +119,10 @@
+                 setlocale(LC_ALL, $lang_charset);
+             }
+         }
++	/* avoid FreeBSD issapce(3) bug */
++	if(NLS::getCharset() == "UTF-8"){
++		setlocale(LC_CTYPE,"C");
++	}
+         @putenv('LANG=' . $lang_charset);
+         @putenv('LANGUAGE=' . $lang_charset);
+     }
diff --git a/www/horde-base/files/patch-lib_Horde_NLS.php b/www/horde-base/files/patch-lib_Horde_NLS.php
deleted file mode 100644
index 4404276773d0..000000000000
--- a/www/horde-base/files/patch-lib_Horde_NLS.php
+++ /dev/null
@@ -1,13 +0,0 @@
---- lib/Horde/NLS.php.orig	2007-09-29 07:22:46.000000000 -0800
-+++ lib/Horde/NLS.php	2007-12-18 11:16:03.000000000 -0900
-@@ -119,6 +119,10 @@
-                 setlocale(LC_ALL, $lang_charset);
-             }
-         }
-+	/* avoid FreeBSD issapce(3) bug */
-+	if(NLS::getCharset() == "UTF-8"){
-+		setlocale(LC_CTYPE,"C");
-+	}
-         @putenv('LANG=' . $lang_charset);
-         @putenv('LANGUAGE=' . $lang_charset);
-     }
-- 
cgit