5 files changed, 25 insertions, 40 deletions

diff --git a/japanese/less/Makefile b/japanese/less/Makefile
index 91119422007e..b93776dc756a 100644
--- a/japanese/less/Makefile
+++ b/japanese/less/Makefile
@@ -6,18 +6,16 @@
 #
 
 PORTNAME=	less+iso
-PORTVERSION=	358.254
-PORTREVISION=	2
+PORTVERSION=	382.258
+PORTREVISION=	0
 CATEGORIES=	japanese
-MASTER_SITES=	http://www25.big.jp/~jam/less/:jless \
-		${MASTER_SITE_LOCAL:S/$/:gtags/}
-MASTER_SITE_SUBDIR=	sf/:gtags
+MASTER_SITES=	http://www25.big.jp/~jam/less/ \
+		${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR=	sf
 DISTNAME=	less-${PORTVERSION:R}
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:jless \
-		${XGTAGS}${EXTRACT_SUFX}:gtags \
-		regex_cs-lwp9k.shar.gz:jless
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX} \
-		${XGTAGS}${EXTRACT_SUFX}
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
+		regex_cs-lwp9k.shar.gz
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 PATCH_SITES=	http://www25.big.jp/~jam/less/
 PATCHFILES=	${DISTNAME}-iso${PORTVERSION:E}.patch.gz
@@ -26,26 +24,22 @@ PATCH_DIST_STRIP=	-p1
 MAINTAINER=	sf@FreeBSD.org
 COMMENT=	Less + zcat + ISO-2022 - a pager similar to more and pg
 
-USE_AUTOTOOLS=	autoconf:213
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-cs-regex
 MAN1=		jless.1 jlesskey.1
 
 DOCDIR=		${PREFIX}/share/doc/less
 READMES=	README.iso README.regex README.iso.jp README.regex.jp
-XGTAGS=		${DISTNAME}-iso${PORTVERSION:E}+gtags-20010110
 
 post-patch:
 	(cd ${WRKSRC} ; \
-	 ${RM} -f configure COPYING; \
+	 ${RM} -f COPYING; \
 	 ${GZCAT} ${DISTDIR}/regex_cs-lwp9k.shar.gz | ${SH} )
-	${PATCH} ${PATCH_DIST_ARGS} < ${WRKDIR}/${XGTAGS}/${XGTAGS}.diff
 
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCDIR}
 	(cd ${WRKSRC}; ${INSTALL_DATA} ${READMES} ${DOCDIR})
-	${INSTALL_DATA} ${WRKDIR}/${XGTAGS}/README ${DOCDIR}/README.gtags
 .endif
 
 .include <bsd.port.mk>
diff --git a/japanese/less/distinfo b/japanese/less/distinfo
index 253fd4cbabf7..49289baec938 100644
--- a/japanese/less/distinfo
+++ b/japanese/less/distinfo
@@ -1,8 +1,9 @@
-MD5 (less-358.tar.gz) = 692a94060a50dd35a4d65176cb899444
-SIZE (less-358.tar.gz) = 231140
-MD5 (less-358-iso254+gtags-20010110.tar.gz) = f7470b0834f168f34211c563cf65beb9
-SIZE (less-358-iso254+gtags-20010110.tar.gz) = 8552
+MD5 (less-382.tar.gz) = 103fe4aef6297b93f0f73f38cc3b1bd7
+SHA256 (less-382.tar.gz) = d33cc51f220647d015fd526b3782cde03c5d8b18c5233e6388a0047a70446fe7
+SIZE (less-382.tar.gz) = 264414
 MD5 (regex_cs-lwp9k.shar.gz) = 2218027bfdb7acf3c1a052ed48a6d48b
+SHA256 (regex_cs-lwp9k.shar.gz) = 9657fc989e4935ebe3e71ee515573013d69eb2afe01ead985ed56b85e41c8462
 SIZE (regex_cs-lwp9k.shar.gz) = 60569
-MD5 (less-358-iso254.patch.gz) = 4ccb02cfcdd9aafc2b147d56c895716a
-SIZE (less-358-iso254.patch.gz) = 71182
+MD5 (less-382-iso258.patch.gz) = bc42654a79a727c15b87596708a22333
+SHA256 (less-382-iso258.patch.gz) = 0681485f47237aeee42a34bbf0ab55215933c7713d1be80ac202a31c7a6fdc31
+SIZE (less-382-iso258.patch.gz) = 87859
diff --git a/japanese/less/files/patch-aa b/japanese/less/files/patch-aa
index 3e8c5eb4aa5f..d34c5e31e612 100644
--- a/japanese/less/files/patch-aa
+++ b/japanese/less/files/patch-aa
@@ -1,12 +1,14 @@
---- Makefile.in.orig	Sun Jul  9 09:26:42 2000
-+++ Makefile.in	Mon Nov  6 05:13:09 2000
-@@ -22,11 +22,11 @@
+--- Makefile.in.orig	Wed Feb  4 13:52:26 2004
++++ Makefile.in	Fri Dec  9 22:42:45 2005
+@@ -22,13 +22,13 @@
  
  # Where the installed binary goes.
  bindir = @bindir@
 -binprefix = 
 +binprefix = j
  
+ sysconfdir = @sysconfdir@
+ 
  mandir = @mandir@
  manext = 1
 -manprefix = 
diff --git a/japanese/less/files/patch-ad b/japanese/less/files/patch-ad
deleted file mode 100644
index 35c16f16c2dc..000000000000
--- a/japanese/less/files/patch-ad
+++ /dev/null
@@ -1,11 +0,0 @@
---- search.c.orig	Thu Feb 27 00:22:02 2003
-+++ search.c	Thu Feb 27 00:22:54 2003
-@@ -1371,7 +1371,7 @@
- 				if (charset)
- 					free(charset);
- 				charset = (CHARSET *)
--					ecalloc(len, sizeof(CHARSET));
-+					ecalloc(len+1, sizeof(CHARSET));
- 			}
- 
- 			cvt_text(line, charset, line, NULL, ops);
diff --git a/japanese/less/pkg-plist b/japanese/less/pkg-plist
index fbf588bb94e8..341d67df35cd 100644
--- a/japanese/less/pkg-plist
+++ b/japanese/less/pkg-plist
@@ -1,9 +1,8 @@
 bin/jless
 bin/jlesskey
 bin/jlessecho
-share/doc/less/README.gtags
-share/doc/less/README.iso
-share/doc/less/README.iso.jp
-share/doc/less/README.regex
-share/doc/less/README.regex.jp
+%%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