From 63b5551f531bf21b41b5ed09448193c323a27fae Mon Sep 17 00:00:00 2001
From: Norikatsu Shigemura <nork@FreeBSD.org>
Date: Mon, 10 May 2010 14:23:54 +0000
Subject: o Add support .xz/.lzma (required xz and lzma commands). o
 MAKE_JOBS_SAFE confirmed. o Fix typo (s/DOCDIR/DOCSDIR/g). o Bump
 PORTREVISION, accordingly.

Inspired by:	import of liblzma, xz, xzdec, lzmainfo by mm@
---
 japanese/less/Makefile               |  9 +++++----
 japanese/less/files/patch-filename.c | 18 ++++++++++++++++++
 japanese/less/pkg-plist              | 10 +++++-----
 3 files changed, 28 insertions(+), 9 deletions(-)
 create mode 100644 japanese/less/files/patch-filename.c

(limited to 'japanese')

diff --git a/japanese/less/Makefile b/japanese/less/Makefile
index 6af9b4be807d..ceb4f999f2f9 100644
--- a/japanese/less/Makefile
+++ b/japanese/less/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	less+iso
 PORTVERSION=	382.262
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	japanese
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	nork
@@ -28,11 +28,12 @@ PATCH_DIST_STRIP=	-p1
 MAINTAINER=	nork@FreeBSD.org
 COMMENT=	Less + zcat + ISO-2022 - a pager similar to more and pg
 
+MAKE_JOBS_SAFE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-cs-regex
 MAN1=		jless.1 jlesskey.1
 
-DOCDIR=		${PREFIX}/share/doc/less
+DOCSDIR=	${PREFIX}/share/doc/less
 READMES=	README.iso README.regex README.iso.jp README.regex.jp
 
 post-patch:
@@ -44,8 +45,8 @@ post-patch:
 
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCDIR}
-	(cd ${WRKSRC}; ${INSTALL_DATA} ${READMES} ${DOCDIR})
+	${MKDIR} ${DOCSDIR}
+	(cd ${WRKSRC}; ${INSTALL_DATA} ${READMES} ${DOCSDIR})
 .endif
 
 .include <bsd.port.mk>
diff --git a/japanese/less/files/patch-filename.c b/japanese/less/files/patch-filename.c
new file mode 100644
index 000000000000..004eb4a38ebc
--- /dev/null
+++ b/japanese/less/files/patch-filename.c
@@ -0,0 +1,18 @@
+--- filename.c.orig	2010-05-10 23:08:16.800855000 +0900
++++ filename.c	2010-05-10 23:10:53.231134025 +0900
+@@ -802,9 +802,15 @@
+ 	else if (strcmp(".gz", &filename[length - 3]) == 0 ||
+ 		 strcmp(".GZ", &filename[length - 3]) == 0)
+ 		return ("| gzip -cd %s");
++	else if (strcmp(".xz", &filename[length - 3]) == 0 ||
++		 strcmp(".XZ", &filename[length - 3]) == 0)
++		return ("| xz -cd %s");
+ 	else if (strcmp(".bz2", &filename[length - 4]) == 0 ||
+ 		 strcmp(".BZ2", &filename[length - 4]) == 0)
+ 		return ("| bzip2 -cd %s");
++	else if (strcmp(".lzma", &filename[length - 5]) == 0 ||
++		 strcmp(".LZMA", &filename[length - 5]) == 0)
++		return ("| lzma -cd %s");
+ 	else
+ 		return (NULL);
+ }
diff --git a/japanese/less/pkg-plist b/japanese/less/pkg-plist
index 341d67df35cd..d75e698ad550 100644
--- a/japanese/less/pkg-plist
+++ b/japanese/less/pkg-plist
@@ -1,8 +1,8 @@
 bin/jless
 bin/jlesskey
 bin/jlessecho
-%%PORTDOCS%%share/doc/less/README.iso
-%%PORTDOCS%%share/doc/less/README.iso.jp
-%%PORTDOCS%%share/doc/less/README.regex
-%%PORTDOCS%%share/doc/less/README.regex.jp
-@dirrm share/doc/less
+%%PORTDOCS%%%%DOCSDIR%%/README.iso
+%%PORTDOCS%%%%DOCSDIR%%/README.iso.jp
+%%PORTDOCS%%%%DOCSDIR%%/README.regex
+%%PORTDOCS%%%%DOCSDIR%%/README.regex.jp
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
-- 
cgit v1.2.3