[pkgsrc/pkgsrc-2010Q2]: pkgsrc Pullup ticket #3162 - requested by obache

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/pkgsrc-2010Q2]: pkgsrc Pullup ticket #3162 - requested by obache
From: tron <tron%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 09:33:30 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/31aa8ece7cd5
branches:  pkgsrc-2010Q2
changeset: 576905:31aa8ece7cd5
user:      tron <tron%pkgsrc.org@localhost>
date:      Mon Jul 12 12:39:49 2010 +0000

description:
Pullup ticket #3162 - requested by obache
editors/mule: bug fix patch
inputmethod/ja-freewnn-lib: bug fix patch
inputmethod/kinput2: bug fix patch

Revisions pulled up:
- editors/mule/Makefile                         1.44
- editors/mule/distinfo                         1.8
- editors/mule/patches/patch-cj                 1.1
- inputmethod/ja-freewnn-lib/Makefile           1.10
- inputmethod/ja-freewnn-lib/buildlink3.mk      1.8
- inputmethod/ja-freewnn-lib/distinfo           1.10
- inputmethod/ja-freewnn-lib/patches/patch-ag   1.6
- inputmethod/ja-freewnn-server-bin/Makefile    1.17
- inputmethod/kinput2/Makefile                  1.20
---
Module Name:    pkgsrc
Committed By:   obache
Date:           Sun Jul 11 02:53:25 UTC 2010

Modified Files:
        pkgsrc/inputmethod/ja-freewnn-lib: Makefile buildlink3.mk distinfo
        pkgsrc/inputmethod/ja-freewnn-lib/patches: patch-ag

Log Message:
Fixes memory corruption, PR#43586.

Bump PKGREVISION.
---
Module Name:    pkgsrc
Committed By:   obache
Date:           Sun Jul 11 02:56:35 UTC 2010

Modified Files:
        pkgsrc/inputmethod/ja-freewnn-server-bin: Makefile

Log Message:
Bump PKGREVISION to force rebuild with fixed ja-FreeWnn-lib,
or wnnkill dumped core.
---
Module Name:    pkgsrc
Committed By:   obache
Date:           Sun Jul 11 02:58:16 UTC 2010

Modified Files:
        pkgsrc/inputmethod/kinput2: Makefile

Log Message:
Bump PKGREVISION to force rebuild with fixed ja-FreeWnn-lib, or dumped core.
---
odule Name:     pkgsrc
Committed By:   obache
Date:           Sun Jul 11 03:00:33 UTC 2010

Modified Files:
        pkgsrc/editors/mule: Makefile distinfo
Added Files:
        pkgsrc/editors/mule/patches: patch-cj

Log Message:
* add patch-cj to fix build failure
* add user-destdir installation support.
* Bump PKGREVISION to force rebuild with fixed ja-FreeWnn-lib.

diffstat:

 editors/mule/Makefile                       |  14 ++++-
 editors/mule/distinfo                       |   3 +-
 editors/mule/patches/patch-cj               |  59 +++++++++++++++++++++++++++++
 inputmethod/ja-freewnn-lib/Makefile         |   4 +-
 inputmethod/ja-freewnn-lib/buildlink3.mk    |   4 +-
 inputmethod/ja-freewnn-lib/distinfo         |   4 +-
 inputmethod/ja-freewnn-lib/patches/patch-ag |  11 ++++-
 inputmethod/ja-freewnn-server-bin/Makefile  |   4 +-
 inputmethod/kinput2/Makefile                |   3 +-
 9 files changed, 91 insertions(+), 15 deletions(-)

diffs (219 lines):

diff -r 7ed225471069 -r 31aa8ece7cd5 editors/mule/Makefile
--- a/editors/mule/Makefile     Sat Jul 10 12:08:06 2010 +0000
+++ b/editors/mule/Makefile     Mon Jul 12 12:39:49 2010 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.43 2009/09/02 08:34:13 wiz Exp $
+# $NetBSD: Makefile,v 1.43.8.1 2010/07/12 12:39:49 tron Exp $
 
 DISTNAME=      mule-2.3
-PKGREVISION=   5
+PKGREVISION=   6
 CATEGORIES=    editors
 MASTER_SITES=  ftp://ftp.m17n.org/pub/mule/
 
@@ -9,6 +9,8 @@
 HOMEPAGE=      http://www.m17n.org/mule/
 COMMENT=       Multilingual GNU editing macros (editor)
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 CONFLICTS=     emacs-[0-9]*
 
 # build PATH in the dumped mule is not a problem
@@ -35,6 +37,10 @@
 
 INFO_FILES=    # PLIST
 
+INSTALL_MAKE_FLAGS=    prefix=${DESTDIR}${PREFIX}
+INSTALL_MAKE_FLAGS+=   infodir=${DESTDIR}${GNU_CONFIGURE_INFODIR}
+INSTALL_MAKE_FLAGS+=   mandir=${DESTDIR}${GNU_CONFIGURE_MANDIR}
+
 # Remove original versions of patched files so that aren't installed.
 post-build:
        ${FIND} ${WRKSRC} -name "*.orig" | ${XARGS} ${RM} -f
@@ -45,8 +51,8 @@
                -e 's/etl\([0-9]*\)-latin1/lt1-40-etl/' \
                -e 's/etl\([0-9]*\)-latin\([0-9]\)/lt\2-\1-etl/' \
                -e 's/jiskan24/j83-48/' \
-               < ${WRKSRC}/etc/CHARSETS > ${PREFIX}/lib/mule/19.28/etc/CHARSETS
-       #diff -u                ${WRKSRC}/etc/CHARSETS ${PREFIX}/lib/mule/19.28/etc/CHARSETS
+               < ${WRKSRC}/etc/CHARSETS > ${DESTDIR}${PREFIX}/lib/mule/19.28/etc/CHARSETS
+       #diff -u                ${WRKSRC}/etc/CHARSETS ${DESTDIR}${PREFIX}/lib/mule/19.28/etc/CHARSETS
 
 .include "../../x11/xbitmaps/buildlink3.mk"
 .include "../../x11/libXaw/buildlink3.mk"
diff -r 7ed225471069 -r 31aa8ece7cd5 editors/mule/distinfo
--- a/editors/mule/distinfo     Sat Jul 10 12:08:06 2010 +0000
+++ b/editors/mule/distinfo     Mon Jul 12 12:39:49 2010 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2006/01/04 20:35:08 joerg Exp $
+$NetBSD: distinfo,v 1.7.40.1 2010/07/12 12:39:49 tron Exp $
 
 SHA1 (mule-2.3.tar.gz) = 52737767955caf2fde34b994f367a89c5d8a045f
 RMD160 (mule-2.3.tar.gz) = 52b93e746a7a796549a44104ab1898954df044bf
@@ -64,3 +64,4 @@
 SHA1 (patch-cg) = 2fbe0de8a502a2fe083379a39aaf126148d0ded3
 SHA1 (patch-ch) = f5314755074b7301ee36825c82d15763b1d3f062
 SHA1 (patch-ci) = b172fe40cccba2aa622a5522fffa421cbcd299a5
+SHA1 (patch-cj) = 19b158106f4fbe382084dc8e6ddd6545e506e30d
diff -r 7ed225471069 -r 31aa8ece7cd5 editors/mule/patches/patch-cj
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/editors/mule/patches/patch-cj     Mon Jul 12 12:39:49 2010 +0000
@@ -0,0 +1,59 @@
+$NetBSD: patch-cj,v 1.1.2.2 2010/07/12 12:39:50 tron Exp $
+
+--- src/wnnfns.c.orig  1995-05-30 06:49:10.000000000 +0000
++++ src/wnnfns.c
+@@ -322,6 +322,9 @@ static struct wnn_env *wnnfns_env_rev[NS
+ static int wnnfns_norm;
+ static unsigned char lc_wnn_server_type[NSERVER] = {LCJP, LCCN, LCINV, LCKR};
+ 
++static int yes_or_no();
++static void puts2();
++
+ /* Lisp Variables and Constants Definition */
+ Lisp_Object   Qjserver;
+ Lisp_Object   Qcserver;
+@@ -430,8 +433,6 @@ Specify password files of dictionary and
+      int                      nargs;
+      register Lisp_Object     *args;
+ {
+-  static int yes_or_no();
+-  static void puts2();
+   struct gcpro gcpro1;
+   int snum;
+   CHECK_STRING (args[0], 0);
+@@ -1242,8 +1243,6 @@ Specify password files of dictionary and
+      int                        nargs;
+      register Lisp_Object       *args;
+ {
+-  static int yes_or_no();
+-  static void puts2();
+   struct gcpro gcpro1;
+   int   snum;
+   CHECK_STRING (args[0], 0);
+@@ -1278,8 +1277,6 @@ Specify password files of dictionary and
+      int                        nargs;
+      register Lisp_Object       *args;
+ {
+-  static int yes_or_no();
+-  static void puts2();
+   struct gcpro gcpro1;
+   int   snum;
+   CHECK_STRING (args[0], 0);
+@@ -1314,8 +1311,6 @@ Specify password files of dictionary and
+      int                        nargs;
+      register Lisp_Object       *args;
+ {
+-  static int yes_or_no();
+-  static void puts2();
+   struct gcpro gcpro1;
+   int   snum;
+   int dic_no;
+@@ -1376,8 +1371,6 @@ Specify password files of dictionary and
+      int                        nargs;
+      register Lisp_Object       *args;
+ {
+-  static int yes_or_no();
+-  static void puts2();
+   struct gcpro gcpro1;
+   int   snum;
+   int   dic_no;
diff -r 7ed225471069 -r 31aa8ece7cd5 inputmethod/ja-freewnn-lib/Makefile
--- a/inputmethod/ja-freewnn-lib/Makefile       Sat Jul 10 12:08:06 2010 +0000
+++ b/inputmethod/ja-freewnn-lib/Makefile       Mon Jul 12 12:39:49 2010 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2008/07/14 12:56:07 joerg Exp $
+# $NetBSD: Makefile,v 1.9.18.1 2010/07/12 12:39:50 tron Exp $
 #
 
 PKGNAME=       ja-FreeWnn-lib-1.10
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    japanese inputmethod
 
 MAINTAINER=    tech-pkg-ja%jp.NetBSD.org@localhost
diff -r 7ed225471069 -r 31aa8ece7cd5 inputmethod/ja-freewnn-lib/buildlink3.mk
--- a/inputmethod/ja-freewnn-lib/buildlink3.mk  Sat Jul 10 12:08:06 2010 +0000
+++ b/inputmethod/ja-freewnn-lib/buildlink3.mk  Mon Jul 12 12:39:49 2010 +0000
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:46 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.7.12.1 2010/07/12 12:39:50 tron Exp $
 
 BUILDLINK_TREE+=       ja-FreeWnn-lib
 
 .if !defined(JA_FREEWNN_LIB_BUILDLINK3_MK)
 JA_FREEWNN_LIB_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.ja-FreeWnn-lib+= ja-FreeWnn-lib>=1.10nb3
+BUILDLINK_API_DEPENDS.ja-FreeWnn-lib+= ja-FreeWnn-lib>=1.10nb4
 BUILDLINK_PKGSRCDIR.ja-FreeWnn-lib?=   ../../inputmethod/ja-freewnn-lib
 BUILDLINK_DEPMETHOD.ja-freewnn?=       build
 .endif # JA_FREEWNN_LIB_BUILDLINK3_MK
diff -r 7ed225471069 -r 31aa8ece7cd5 inputmethod/ja-freewnn-lib/distinfo
--- a/inputmethod/ja-freewnn-lib/distinfo       Sat Jul 10 12:08:06 2010 +0000
+++ b/inputmethod/ja-freewnn-lib/distinfo       Mon Jul 12 12:39:49 2010 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2006/06/21 15:15:16 minskim Exp $
+$NetBSD: distinfo,v 1.9.38.1 2010/07/12 12:39:50 tron Exp $
 
 SHA1 (freewnn/FreeWnn-1.10.tar.gz) = 66a0640d4632d82b7012c4aa2239bc1d69d45034
 RMD160 (freewnn/FreeWnn-1.10.tar.gz) = 8644371c258b1f32c36d5f0318032a0a50c5f640
@@ -12,7 +12,7 @@
 SHA1 (patch-ad) = b78a1c7c5358a2114fa99249b08a06274d03a187
 SHA1 (patch-ae) = e33833015936ce9c5ef65a97faf3f05f0c464ddc
 SHA1 (patch-af) = 26d45af3c65df5af5299c837a123129ec5919bd4
-SHA1 (patch-ag) = 8668a1200b775b56c6a173bf85a7cf29d887803c
+SHA1 (patch-ag) = 80614674772560336255ff731b7af456122124d2
 SHA1 (patch-ah) = 1795d35ffc0bdbc3d082c46afb86d616bef52d68
 SHA1 (patch-ai) = ecba683c308c4acf69f0e5835ee241dfbab5b71a
 SHA1 (patch-aj) = 33420feacb29abd59882672dfeb254527aa99fe6
diff -r 7ed225471069 -r 31aa8ece7cd5 inputmethod/ja-freewnn-lib/patches/patch-ag
--- a/inputmethod/ja-freewnn-lib/patches/patch-ag       Sat Jul 10 12:08:06 2010 +0000
+++ b/inputmethod/ja-freewnn-lib/patches/patch-ag       Mon Jul 12 12:39:49 2010 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.5 2006/06/21 15:15:16 minskim Exp $
+$NetBSD: patch-ag,v 1.5.38.1 2010/07/12 12:39:51 tron Exp $
 
 --- Wnn/jlib/js.c.orig 1999-05-17 03:04:45.000000000 +0000
 +++ Wnn/jlib/js.c
@@ -46,3 +46,12 @@
  
  #if DEBUG
        xerror("jslib:Can't connect socket.\n");
+@@ -2554,7 +2550,7 @@ char *lang;
+ int cnt;
+ {
+     FILE *fp;
+-    static char s[6][EXPAND_PATH_LENGTH];
++    static char s[7][EXPAND_PATH_LENGTH];
+     char serv_defs[EXPAND_PATH_LENGTH];
+     char data[1024];
+     int num;
diff -r 7ed225471069 -r 31aa8ece7cd5 inputmethod/ja-freewnn-server-bin/Makefile
--- a/inputmethod/ja-freewnn-server-bin/Makefile        Sat Jul 10 12:08:06 2010 +0000
+++ b/inputmethod/ja-freewnn-server-bin/Makefile        Mon Jul 12 12:39:49 2010 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2007/07/04 20:54:40 jlam Exp $
+# $NetBSD: Makefile,v 1.16.28.1 2010/07/12 12:39:51 tron Exp $
 #
 
 PKGNAME=       ja-FreeWnn-server-bin-1.10
-PKGREVISION=   5
+PKGREVISION=   6
 CATEGORIES=    japanese inputmethod
 
 MAINTAINER=    tech-pkg-ja%jp.NetBSD.org@localhost
diff -r 7ed225471069 -r 31aa8ece7cd5 inputmethod/kinput2/Makefile
--- a/inputmethod/kinput2/Makefile      Sat Jul 10 12:08:06 2010 +0000
+++ b/inputmethod/kinput2/Makefile      Mon Jul 12 12:39:49 2010 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2010/02/15 13:41:17 obache Exp $
+# $NetBSD: Makefile,v 1.19.4.1 2010/07/12 12:39:51 tron Exp $
 
 DISTNAME=      kinput2-v3.1
 PKGNAME=       kinput2-3.1
+PKGREVISION=   1
 CATEGORIES=    japanese inputmethod
 MASTER_SITES=  ftp://ftp.sra.co.jp/pub/x11/kinput2/
Prev by Date: [pkgsrc/trunk]: pkgsrc/doc Note initial addition of p5-App-cpanoutdated versi...
Next by Date: [pkgsrc/trunk]: pkgsrc/www/p5-FCGI-Client Initial import of p5-FCGI-Client ve...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc Note initial addition of p5-App-cpanoutdated versi...
Next by Thread: [pkgsrc/trunk]: pkgsrc/www/p5-FCGI-Client Initial import of p5-FCGI-Client ve...
Indexes:
Home | Main Index | Thread Index | Old Index