On Tue, 18 Apr 2017 19:22:29 -0600
"Anthony J. Bentley" <anth...@anjbe.name> wrote:
>> +COMMENT= Enhanced less with iso-2022-jp and UTF-8 encodings support
>
> "Enhanced" should be lowercase.
I see. Fixed it.
>> -# BSD
>> +# GPLv2
>
> Looks like it's dual-licensed, GPLv2+ and BSD?
This was come from my misunderstanding. I'm sorry. Actually it's
still dual license, so we can/should keep BSD.
ok?
diff --git a/japanese/less/Makefile b/japanese/less/Makefile
index 6bdcee0bff8..ecc1698ba60 100644
--- a/japanese/less/Makefile
+++ b/japanese/less/Makefile
@@ -1,30 +1,33 @@
# $OpenBSD: Makefile,v 1.25 2014/11/27 12:26:49 naddy Exp $
-COMMENT= less + zcat + ISO-2022 - a pager similar to more and pg
+COMMENT= enhanced less with iso-2022-jp and UTF-8 encodings support
-DISTNAME= less-332
-PKGNAME= ja-less-3.32pl2.48
-REVISION= 0
-CATEGORIES= japanese
-MASTER_SITES= ${MASTER_SITE_GNU:=less/}
-HOMEPAGE= http://www.pobox.com/~jam/less/
+V= 382.262.03.01
-MASTER_SITES0= ftp://ftp.big.or.jp/pub/usr2/jam/less/
-PATCHFILES= less-332-iso242.patch.gz:0 \
- less-332-iso242-243.patch.gz:0 \
- less-332-iso243-244.patch.gz:0 \
- less-332-iso244-245.patch.gz:0 \
- less-332-iso245-247.patch.gz:0 \
- less-332-iso247-248.patch.gz:0
+GH_ACCOUNT= hrs-allbsd
+GH_PROJECT= less
+GH_TAGNAME= v${V}
-PATCH_DIST_STRIP= -p1
+PKGNAME= ja-less-${V}
+CATEGORIES= japanese
+HOMEPAGE=
http://web.archive.org/web/20070220213232/http://www25.big.or.jp/~jam/less
-MAINTAINER=Marc Espie <es...@openbsd.org>
+MAINTAINER = YASUOKA Masahiko <yasu...@yasuoka.net>
# BSD
PERMIT_PACKAGE_CDROM= Yes
WANTLIB= c ncurses
CONFIGURE_STYLE= gnu dest
+CONFIGURE_ARGS= --with-cs-regex
+
+DOCS= README.iso README.iso.jp README.lesw.euc README.regex \
+ README.regex.jp README.ext.jp
+
+post-install:
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ja-less
+.for _f in ${DOCS}
+ ${INSTALL_DATA} ${WRKSRC}/${_f} ${PREFIX}/share/doc/ja-less
+.endfor
.include <bsd.port.mk>
diff --git a/japanese/less/distinfo b/japanese/less/distinfo
index 854ad683b7e..6554f7b66d4 100644
--- a/japanese/less/distinfo
+++ b/japanese/less/distinfo
@@ -1,14 +1,2 @@
-SHA256 (less-332-iso242-243.patch.gz) =
BqUDmpt62faVbPStHXTYus2mPwHflvClS/DeZPlQsvo=
-SHA256 (less-332-iso242.patch.gz) =
GfQ3nZ6DlSMn5UTDqN2C3DMHrxptIoMzEbl8u228x9M=
-SHA256 (less-332-iso243-244.patch.gz) =
d7nga8cvfVBb+IuXkEe5Jo3NGmECIq5R7MfpvO0Ga1s=
-SHA256 (less-332-iso244-245.patch.gz) =
8TCGC0JYfIXBZcC/BC1JESrj7dWWoEvbMmy7FrP6scQ=
-SHA256 (less-332-iso245-247.patch.gz) =
B9oLi4VaBp34weAa3QR0YJcYuntd2Uq/4/v10yMnKhI=
-SHA256 (less-332-iso247-248.patch.gz) =
4JYiP5vI/Bh+s8XtrT19pZdIcDEKzdur/nrR+lkPYpM=
-SHA256 (less-332.tar.gz) = xrPeY8Ku1E4OTUD8tG3PaBL17PNOOGTr9PetB3xMooA=
-SIZE (less-332-iso242-243.patch.gz) = 10128
-SIZE (less-332-iso242.patch.gz) = 61306
-SIZE (less-332-iso243-244.patch.gz) = 3212
-SIZE (less-332-iso244-245.patch.gz) = 490
-SIZE (less-332-iso245-247.patch.gz) = 4597
-SIZE (less-332-iso247-248.patch.gz) = 3806
-SIZE (less-332.tar.gz) = 204926
+SHA256 (less-382.262.03.01.tar.gz) =
sZxWL8QyfP54O+B0zKAwJS3THsIsKYKaq8EDhJtqyko=
+SIZE (less-382.262.03.01.tar.gz) = 471513
diff --git a/japanese/less/patches/patch-Makefile_in
b/japanese/less/patches/patch-Makefile_in
deleted file mode 100644
index 9f2cf56861b..00000000000
--- a/japanese/less/patches/patch-Makefile_in
+++ /dev/null
@@ -1,17 +0,0 @@
-$OpenBSD: patch-Makefile_in,v 1.1 2007/10/26 21:42:18 ajacoutot Exp $
---- Makefile.in.orig Fri Oct 26 23:39:07 2007
-+++ Makefile.in Fri Oct 26 23:39:08 2007
-@@ -22,11 +22,11 @@ exec_prefix = @exec_prefix@
-
- # 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/pkg/DESCR b/japanese/less/pkg/DESCR
index 7b0a8856edd..152f11ecff0 100644
--- a/japanese/less/pkg/DESCR
+++ b/japanese/less/pkg/DESCR
@@ -1,9 +1,9 @@
- Less is a program similar to more (1), but which allows
- backward movement in the file as well as forward movement.
- Also, less does not have to read the entire input file
- before starting, so with large input files it starts up
- faster than text editors like vi (1).
+Less is a program similar to more(1), but which allows backward
+movement in the file as well as forward movement. Also, less does not
+have to read the entire input file before starting, so with large
+input files it starts up faster than text editors like vi(1).
This enhanced less supports ISO 2022 code extension techniques and
Japanese codes(EUC Japanese, SJIS) and compressed(or gzipped) file
-viewing. The author of this patch is j...@pobox.com.
+viewing. The author of this patch is j...@pobox.com and UTF-8 support
+patch is written by bogytech.
diff --git a/japanese/less/pkg/PLIST b/japanese/less/pkg/PLIST
index 50b8b41eecb..771a534f0a9 100644
--- a/japanese/less/pkg/PLIST
+++ b/japanese/less/pkg/PLIST
@@ -1,6 +1,13 @@
@comment $OpenBSD: PLIST,v 1.3 2004/09/15 00:56:29 espie Exp $
-bin/jless
-bin/jlessecho
-bin/jlesskey
+@bin bin/jless
+@bin bin/jlessecho
+@bin bin/jlesskey
@man man/man1/jless.1
@man man/man1/jlesskey.1
+share/doc/ja-less/
+share/doc/ja-less/README.ext.jp
+share/doc/ja-less/README.iso
+share/doc/ja-less/README.iso.jp
+share/doc/ja-less/README.lesw.euc
+share/doc/ja-less/README.regex
+share/doc/ja-less/README.regex.jp
