5 files changed, 27 insertions, 64 deletions

diff --git a/japanese/less/Makefile b/japanese/less/Makefile
index 7614ec6cc99c..8278d1ecdf2a 100644
--- a/japanese/less/Makefile
+++ b/japanese/less/Makefile
@@ -1,22 +1,23 @@
 # New ports collection makefile for:	jless
-# Version required:	290
+# Version required:	332
 # Date created:		7 March 1995
 # Whom:			Nobuhiro Yasutomi <nobu@psrc.isac.co.jp>
 #
-# $Id: Makefile,v 1.7 1996/11/11 10:12:22 max Exp $
+# $Id: Makefile,v 1.8 1996/11/18 10:23:58 asami Exp $
 #
 
-DISTNAME=	less-290
-PKGNAME=	jp-less-290
+DISTNAME=	less-332
+PKGNAME=	jp-less-332
 CATEGORIES=	japanese
 MASTER_SITES=	${MASTER_SITE_GNU}
 
 PATCH_SITES=	ftp://ftp.aist-nara.ac.jp/pub/misc/less/
-PATCHFILES=	less-290-iso2.pl1.gz
+PATCHFILES=	less-332-iso221.patch.gz
 PATCH_DIST_STRIP=	-p1
 
-MAINTAINER=	asami@FreeBSD.ORG
+MAINTAINER=	nobu@psrc.isac.co.jp
 
-HAS_CONFIGURE=	yes
+GNU_CONFIGURE=	yes
+MAN1=		jless.1 jlesskey.1
 
 .include <bsd.port.mk>
diff --git a/japanese/less/distinfo b/japanese/less/distinfo
index 7e01332344ac..0fed3623930c 100644
--- a/japanese/less/distinfo
+++ b/japanese/less/distinfo
@@ -1,2 +1,2 @@
-MD5 (less-290.tar.gz) = 0303ae0f5df0a6de5fca674f507588ee
-MD5 (less-290-iso2.pl1.gz) = 3ad92c7defa94eb19c58c79f23c92b0f
+MD5 (less-332.tar.gz) = be6b85092fa00c030119a0b12a1e8c44
+MD5 (less-332-iso221.patch.gz) = 699b5c99a6887b762d3521a865b30997
diff --git a/japanese/less/files/patch-aa b/japanese/less/files/patch-aa
index 8e639d73c558..9cc9bb57cd62 100644
--- a/japanese/less/files/patch-aa
+++ b/japanese/less/files/patch-aa
@@ -1,11 +1,16 @@
---- Makefile.in.orig	Wed Apr 19 18:27:08 1995
-+++ Makefile.in	Wed Apr 19 18:27:12 1995
-@@ -80,6 +80,8 @@
- 	${INSTALL_DATA} ${srcdir}/less.hlp ${datadir}/less.hlp
- 	${INSTALL_DATA} ${srcdir}/less.nro ${mandir}/${manprefix}less.${manext}
- 	${INSTALL_DATA} ${srcdir}/lesskey.nro ${mandir}/${manprefix}lesskey.${manext}
-+	rm -f ${mandir}/${manprefix}less.${manext}.gz ${mandir}/${manprefix}lesskey.${manext}.gz
-+	gzip ${mandir}/${manprefix}less.${manext} ${mandir}/${manprefix}lesskey.${manext}
- 
- installdirs: mkinstalldirs
- 	${srcdir}/mkinstalldirs ${bindir} ${datadir} ${mandir}
+--- Makefile.in.orig	Sat Sep  6 16:49:17 1997
++++ Makefile.in	Sat Sep  6 16:55:37 1997
+@@ -22,11 +22,11 @@
+ 
+ # Where the installed binary goes.
+ bindir = ${exec_prefix}/bin
+-binprefix = 
++binprefix = j
+ 
+ mandir = ${prefix}/man/man${manext}
+ manext = 1
+-manprefix = 
++manprefix = j
+ 
+ #### End of system configuration section. ####
+ 
diff --git a/japanese/less/files/patch-ab b/japanese/less/files/patch-ab
deleted file mode 100644
index c6386962c40e..000000000000
--- a/japanese/less/files/patch-ab
+++ /dev/null
@@ -1,43 +0,0 @@
---- Makefile.in-orig	Wed Apr 19 18:36:52 1995
-+++ Makefile.in	Wed Apr 19 18:38:09 1995
-@@ -22,14 +22,14 @@
- 
- # Where the installed binary goes.
- bindir = ${exec_prefix}/bin
--binprefix = 
-+binprefix = j
- 
- # Where the help file goes.
- datadir = ${prefix}/share
- 
- mandir = ${prefix}/man/man${manext}
- manext = 1
--manprefix = 
-+manprefix = j
- 
- #### End of system configuration section. ####
- 
-@@ -72,12 +72,12 @@
- ${OBJ}: less.h defines.h funcs.h
- 
- filename.${O}: filename.c
--	${CC} -c -DHELPFILE=\"${datadir}/less.hlp\" -I. ${CPPFLAGS} ${CFLAGS} ${srcdir}/filename.c
-+	${CC} -c -DHELPFILE=\"${datadir}/jless.hlp\" -I. ${CPPFLAGS} ${CFLAGS} ${srcdir}/filename.c
- 
- install: all less.hlp less.nro installdirs
- 	${INSTALL_PROGRAM} less ${bindir}/${binprefix}less
- 	${INSTALL_PROGRAM} lesskey ${bindir}/${binprefix}lesskey
--	${INSTALL_DATA} ${srcdir}/less.hlp ${datadir}/less.hlp
-+	${INSTALL_DATA} ${srcdir}/less.hlp ${datadir}/jless.hlp
- 	${INSTALL_DATA} ${srcdir}/less.nro ${mandir}/${manprefix}less.${manext}
- 	${INSTALL_DATA} ${srcdir}/lesskey.nro ${mandir}/${manprefix}lesskey.${manext}
- 	rm -f ${mandir}/${manprefix}less.${manext}.gz ${mandir}/${manprefix}lesskey.${manext}.gz
-@@ -88,7 +88,7 @@
- 
- uninstall:
- 	rm -f ${bindir}/${binprefix}less ${bindir}/${binprefix}lesskey
--	rm -f ${datadir}/less.hlp
-+	rm -f ${datadir}/jless.hlp
- 	rm -f ${mandir}/less.${manext} ${mandir}/lesskey.${manext}
- 
- info:
diff --git a/japanese/less/pkg-plist b/japanese/less/pkg-plist
index 6070a4dcb8fe..58ba9969f5b9 100644
--- a/japanese/less/pkg-plist
+++ b/japanese/less/pkg-plist
@@ -1,5 +1,5 @@
 bin/jless
 bin/jlesskey
-share/jless.hlp
+bin/jlessecho
 man/man1/jless.1.gz
 man/man1/jlesskey.1.gz