Date: Tue, 06 Oct 1998 11:08:58 +0900 From: nobu@rd.isac.co.jp To: FreeBSD-gnats-submit@FreeBSD.ORG Subject: ports/8160: ports/japanese/less update Message-ID: <19981006110858X.nobu@rd.isac.co.jp>
next in thread | raw e-mail | index | archive | help
>Number: 8160
>Category: ports
>Synopsis: post/japanese/less update enhancement patches.
>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: Mon Oct 5 19:10:01 PDT 1998
>Last-Modified:
>Originator: Nobuhiro Yasutomi
>Organization:
ISAC, Inc.
>Release: FreeBSD 2.2.7-RELEASE i386
>Environment:
FreeBSD gallup.rd.isac.co.jp 2.2.7-RELEASE FreeBSD 2.2.7-RELEASE #0: Thu Sep 10 11:14:41 JST 1998 nobu@gallup.rd.isac.co.jp:/usr/src/sys/compile/GALLUP i386
>Description:
There is new issuse distribution patches. Please update
ports/japanese/less as followed.
>How-To-Repeat:
>Fix:
diff -urN less.orig/Makefile less/Makefile
--- less.orig/Makefile Sat Jul 18 07:33:40 1998
+++ less/Makefile Tue Oct 6 10:56:30 1998
@@ -9,19 +9,30 @@
DISTNAME= less-332
PKGNAME= ja-less-332
CATEGORIES= japanese
-MASTER_SITES= ${MASTER_SITE_GNU}
+MASTER_SITES= ${MASTER_SITE_GNU} \
+ ftp://ftp.big.or.jp/pub/usr2/jam/less/contrib/
+DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
+ regex_cs-lwp9k.shar.gz
+EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
PATCH_SITES= ftp://ftp.big.or.jp/pub/usr2/jam/less/
PATCHFILES= less-332-iso242.patch.gz \
less-332-iso242-243.patch.gz \
less-332-iso243-244.patch.gz \
- less-332-iso244-245.patch.gz
+ less-332-iso244-245.patch.gz \
+ less-332-iso245-247.patch.gz \
+ less-332-iso247-248.patch.gz
PATCH_DIST_STRIP= -p1
MAINTAINER= nobu@psrc.isac.co.jp
GNU_CONFIGURE= yes
+CONFIGURE_ARGS = --with-cs-regex
MAN1= jless.1 jlesskey.1
+
+post-patch:
+ (cd ${WRKSRC} ; \
+ zcat ${DISTDIR}/regex_cs-lwp9k.shar.gz | ${SH} )
.include <bsd.port.mk>
diff -urN less.orig/files/md5 less/files/md5
--- less.orig/files/md5 Sat Jul 18 07:33:41 1998
+++ less/files/md5 Tue Oct 6 10:56:30 1998
@@ -3,3 +3,6 @@
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 (regex_cs-lwp9k.shar.gz) = 2218027bfdb7acf3c1a052ed48a6d48b
diff -urN less.orig/patches/patch-ab less/patches/patch-ab
--- less.orig/patches/patch-ab Mon May 4 11:31:08 1998
+++ less/patches/patch-ab Tue Oct 6 11:02:47 1998
@@ -1,11 +1,66 @@
---- Makefile.in- Fri Apr 17 13:37:28 1998
-+++ Makefile.in Wed Apr 22 13:14:28 1998
-@@ -15,7 +15,7 @@
- LDFLAGS = @LDFLAGS@
- O=o
+--- configure.in~ Tue Sep 1 17:45:30 1998
++++ configure.in Mon Sep 7 16:35:05 1998
+@@ -23,6 +23,7 @@
+ AC_CHECK_LIB(gen, regcmp)
+ AC_CHECK_LIB(intl, regcmp)
+ AC_CHECK_LIB(PW, regcmp)
++AC_CHECK_LIB(xpg4, setlocale)
--LIBS = @LIBS@
-+LIBS = @LIBS@ -lxpg4
+ 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
- prefix = @prefix@
- exec_prefix = @exec_prefix@
++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();
++
++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
++fi
++
+
+
+ echo $ac_n "checking for working terminal libraries""... $ac_c" 1>&6
diff -urN less.orig/patches/patch-ac less/patches/patch-ac
--- less.orig/patches/patch-ac Thu Jan 1 09:00:00 1970
+++ less/patches/patch-ac Tue Oct 6 10:56:31 1998
@@ -0,0 +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.
+ */
+
+-char version[] = "332+iso248";
++char version[] = "332+iso248+regex_cs-lwp9k";
>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?19981006110858X.nobu>