Date: Wed, 15 Nov 2000 23:19:48 +0900 From: FUJISHIMA Satsuki <k5@cheerful.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/22870: update: japanese/less Message-ID: <868zqluxkr.wl@cheerful.com>
next in thread | raw e-mail | index | archive | help
>Number: 22870 >Category: ports >Synopsis: update: japanese/less >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed Nov 15 06:30:00 PST 2000 >Closed-Date: >Last-Modified: >Originator: FUJISHIMA Satsuki >Release: FreeBSD 5.0-CURRENT i386 >Organization: N/A >Environment: >Description: o Update japanese/less to latest version. o This patch isn't stated by the author as stable as previous one due to updating based version, but it works for me and having enhanced version based on the same version of /usr/bin/less is not a bad choice. o Change maintainer to me. This was approved by current MAINTAINER, nobu@psrc.isac.co.jp. o tested on 5.0-CURRENT -rPRE_SMPNG and 3.5-STABLE. >How-To-Repeat: the patch below does: o USE_AUTOCONF. Patching configure rather than configure.in is problematic. o remove io.com from MASTER_SITES. It only redirects to pobox.com. o Judge strictly whether setlocale() needs -lxpg4 or not. o install README's. >Fix: Index: Makefile =================================================================== RCS file: /home/ncvs/ports/japanese/less/Makefile,v retrieving revision 1.18 diff -u -w -B -b -r1.18 Makefile --- Makefile 2000/10/23 12:44:52 1.18 +++ Makefile 2000/11/15 10:42:26 @@ -6,10 +6,9 @@ # PORTNAME= less -PORTVERSION= 332 +PORTVERSION= 358 CATEGORIES= japanese MASTER_SITES= http://www.io.com/~kazushi/less/ \ - http://www.pobox.com/~jam/less/ \ ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= less DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ @@ -17,22 +16,28 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} PATCH_SITES= http://www.io.com/~kazushi/less/ -PATCHFILES= ${DISTNAME}-iso242.patch.gz \ - ${DISTNAME}-iso242-243.patch.gz \ - ${DISTNAME}-iso243-244.patch.gz \ - ${DISTNAME}-iso244-245.patch.gz \ - ${DISTNAME}-iso245-247.patch.gz \ - ${DISTNAME}-iso247-248.patch.gz +PATCHFILES= ${DISTNAME}-iso249.patch.gz PATCH_DIST_STRIP= -p1 -MAINTAINER= nobu@psrc.isac.co.jp +MAINTAINER= k5@cheerful.com +USE_AUTOCONF= yes 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 + post-patch: (cd ${WRKSRC} ; \ - zcat ${DISTDIR}/regex_cs-lwp9k.shar.gz | ${SH} ) + ${RM} -f configure COPYING; \ + ${GZCAT} ${DISTDIR}/regex_cs-lwp9k.shar.gz | ${SH} ) + +post-install: +.if !defined(NOPORTDOCS) + ${MKDIR} ${DOCDIR} + (cd ${WRKSRC}; ${INSTALL_DATA} ${READMES} ${DOCDIR}) +.endif .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /home/ncvs/ports/japanese/less/distinfo,v retrieving revision 1.8 diff -u -w -B -b -r1.8 distinfo --- distinfo 1998/10/10 04:01:47 1.8 +++ distinfo 2000/11/15 10:32:44 @@ -1,8 +1,3 @@ -MD5 (less-332.tar.gz) = be6b85092fa00c030119a0b12a1e8c44 -MD5 (less-332-iso242.patch.gz) = f051c0a2cec43431d2bbb1765ebaa748 -MD5 (less-332-iso242-243.patch.gz) = 59f3158bc6eba7eb56dbce26d90f8b93 -MD5 (less-332-iso243-244.patch.gz) = a82d75bacf0d761cfc299657de1599f0 -MD5 (less-332-iso244-245.patch.gz) = 1b9c9c0bdd604793d1ddcd70fb0914ea -MD5 (less-332-iso245-247.patch.gz) = 1a6fb31965797b97ef3ee82464f602ed -MD5 (less-332-iso247-248.patch.gz) = 09754aa5e182e57b44f9a19d6d7ee852 +MD5 (less-358.tar.gz) = 692a94060a50dd35a4d65176cb899444 MD5 (regex_cs-lwp9k.shar.gz) = 2218027bfdb7acf3c1a052ed48a6d48b +MD5 (less-358-iso249.patch.gz) = 2dec2766330aa51d6b790967beb86e5a Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/japanese/less/pkg-plist,v retrieving revision 1.5 diff -u -w -B -b -r1.5 pkg-plist --- pkg-plist 1998/08/31 17:47:39 1.5 +++ pkg-plist 2000/11/15 10:42:52 @@ -1,3 +1,8 @@ bin/jless bin/jlesskey bin/jlessecho +share/doc/less/README.iso +share/doc/less/README.iso.jp +share/doc/less/README.regex +share/doc/less/README.regex.jp +@dirrm share/doc/less Index: files/patch-aa =================================================================== RCS file: /home/ncvs/ports/japanese/less/files/patch-aa,v retrieving revision 1.3 diff -u -w -B -b -r1.3 patch-aa --- files/patch-aa 1997/09/08 03:33:55 1.3 +++ files/patch-aa 2000/11/15 10:32:44 @@ -1,13 +1,13 @@ ---- Makefile.in.orig Sat Sep 6 16:49:17 1997 -+++ Makefile.in Sat Sep 6 16:55:37 1997 +--- Makefile.in.orig Sun Jul 9 09:26:42 2000 ++++ Makefile.in Mon Nov 6 05:13:09 2000 @@ -22,11 +22,11 @@ # Where the installed binary goes. - bindir = ${exec_prefix}/bin + bindir = @bindir@ -binprefix = +binprefix = j - mandir = ${prefix}/man/man${manext} + mandir = @mandir@ manext = 1 -manprefix = +manprefix = j Index: files/patch-ab =================================================================== RCS file: /home/ncvs/ports/japanese/less/files/patch-ab,v retrieving revision 1.5 diff -u -w -B -b -r1.5 patch-ab --- files/patch-ab 1998/10/10 04:01:48 1.5 +++ files/patch-ab 2000/11/15 10:32:44 @@ -1,66 +1,19 @@ ---- configure.in~ Tue Sep 1 17:45:30 1998 -+++ configure.in Mon Sep 7 16:35:05 1998 -@@ -23,6 +23,7 @@ +--- configure.in.orig Mon Nov 6 22:49:26 2000 ++++ configure.in Mon Nov 6 22:50:32 2000 +@@ -24,6 +24,16 @@ AC_CHECK_LIB(gen, regcmp) AC_CHECK_LIB(intl, regcmp) AC_CHECK_LIB(PW, regcmp) -+AC_CHECK_LIB(xpg4, setlocale) - - dnl Checks for terminal libraries - dnl Solaris has curses & termcap, but they need libucb ---- configure.orig Mon Sep 7 16:46:52 1998 -+++ configure Mon Sep 7 16:49:35 1998 -@@ -1224,6 +1224,53 @@ - echo "$ac_t""no" 1>&6 - fi - -+echo $ac_n "checking for setlocale in -lxpg4""... $ac_c" 1>&6 -+echo "configure:1229: checking for setlocale in -lxpg4" >&5 -+ac_lib_var=`echo xpg4'_'setlocale | sed 'y%./+-%__p_%'` -+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ ac_save_LIBS="$LIBS" -+LIBS="-lxpg4 $LIBS" -+cat > conftest.$ac_ext <<EOF -+#line 1237 "configure" -+#include "confdefs.h" -+/* Override any gcc2 internal prototype to avoid an error. */ -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char setlocale(); -+ ++setlocale_works=no ++AC_TRY_RUN([ ++#include <locale.h> +int main() { -+setlocale() -+; return 0; } -+EOF -+if { (eval echo configure:1248: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=no" -+fi -+rm -f conftest* -+LIBS="$ac_save_LIBS" -+ -+fi -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ ac_tr_lib=HAVE_LIB`echo xpg4 | sed -e 's/[^a-zA-Z0-9_]/_/g' \ -+ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` -+ cat >> confdefs.h <<EOF -+#define $ac_tr_lib 1 -+EOF -+ -+ LIBS="-lxpg4 $LIBS" -+ -+else -+ echo "$ac_t""no" 1>&6 ++char *p; p = setlocale(LC_ALL, "ja_JP.EUC"); ++if (p == NULL) exit(1); else exit(0); }], ++setlocale_works=yes,:,:) ++if test x$setlocale_works = xno; then ++AC_CHECK_LIB(xpg4, setlocale) +fi -+ - + dnl Checks for terminal libraries - echo $ac_n "checking for working terminal libraries""... $ac_c" 1>&6 + AC_MSG_CHECKING(for working terminal libraries) Index: files/patch-ac =================================================================== RCS file: /home/ncvs/ports/japanese/less/files/patch-ac,v retrieving revision 1.1 diff -u -w -B -b -r1.1 patch-ac --- files/patch-ac 1998/10/10 05:06:43 1.1 +++ files/patch-ac 2000/11/15 10:32:44 @@ -1,8 +1,8 @@ ---- version.c.org Sun Oct 4 02:02:34 1998 -+++ version.c Sun Oct 4 02:10:53 1998 -@@ -643,4 +643,4 @@ - for JIS X0212.1990. +--- version.c.orig Mon Nov 6 05:30:59 2000 ++++ version.c Mon Nov 6 05:32:35 2000 +@@ -677,4 +677,4 @@ + iso249 10/29/00 Joined with less-358. Fixed some bugs caused by join. */ --char version[] = "332+iso248"; -+char version[] = "332+iso248+regex_cs-lwp9k"; +-char version[] = "358+iso249"; ++char version[] = "358+iso249+regex_cs-lwp9k"; >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?868zqluxkr.wl>