defuzz

5 files changed, 28 insertions, 37 deletions

diff --git a/editors/xemacs/files/patch-sum b/editors/xemacs/files/patch-sum
index e2bc60ee07f..db4fa8aa885 100644
--- a/editors/xemacs/files/patch-sum
+++ b/editors/xemacs/files/patch-sum
@@ -1,8 +1,8 @@
-$NetBSD: patch-sum,v 1.5 1999/12/06 14:24:02 bouyer Exp $
+$NetBSD: patch-sum,v 1.6 1999/12/08 08:18:24 rh Exp $
 
 MD5 (patch-aa) = c5d92bd8fd195c22694f38ee2fb9f6bb
-MD5 (patch-ab) = 9e71184efe53a2cd48fa65aed224abc5
-MD5 (patch-ac) = 74da7f3c4b7320b72c9332e1b737144c
+MD5 (patch-ab) = 5a2d1fb672b4e76fe93583022d967936
+MD5 (patch-ac) = d4b9aaaf02a01e77949dc456b2f13519
 MD5 (patch-ad) = c9ff11d00130b14e1cdd29e85ebad5ab
 MD5 (patch-af) = b1e83f33763647b9498d454e54888824
 MD5 (patch-ag) = 504f7f2faabecc5b3c9d56f915bd8ca0
diff --git a/editors/xemacs/patches/patch-ab b/editors/xemacs/patches/patch-ab
index 9bd4be004a6..e9d6174176a 100644
--- a/editors/xemacs/patches/patch-ab
+++ b/editors/xemacs/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1 1999/06/29 23:13:39 tron Exp $
+$NetBSD: patch-ab,v 1.2 1999/12/08 08:18:25 rh Exp $
 
---- lib-src/Makefile.in.in.orig	Sun Oct 12 03:39:30 1997
-+++ lib-src/Makefile.in.in	Wed Feb 25 01:34:51 1998
-@@ -186,7 +186,7 @@
+--- lib-src/Makefile.in.in.orig	Mon Jun 14 08:32:00 1999
++++ lib-src/Makefile.in.in	Wed Dec  8 09:14:11 1999
+@@ -192,7 +192,7 @@
  
  ## Install the internal utilities.  Until they are installed, we can
  ## just run them directly from lib-src.
@@ -10,10 +10,10 @@ $NetBSD: patch-ab,v 1.1 1999/06/29 23:13:39 tron Exp $
 +install-archlibdir: all
  	@echo; echo "Installing utilities run internally by XEmacs."
  	./make-path ${archlibdir}
- 	if test `(cd ${archlibdir} && $(pwd))` != `$(pwd)`; then \
-@@ -197,19 +197,29 @@
- 	if test `(cd ${archlibdir} && $(pwd))` \
- 	     != `(cd ${srcdir}     && $(pwd))`; then \
+ 	if test "`(cd ${archlibdir} && $(pwd))`" != "`$(pwd)`"; then \
+@@ -203,19 +203,29 @@
+ 	if test "`(cd ${archlibdir} && $(pwd))`" \
+ 	     != "`(cd ${srcdir}     && $(pwd))`"; then \
  	  for f in ${SCRIPTS}; do \
 -	    (cd .. && $(INSTALL_PROGRAM) ${srcdir}/$$f ${archlibdir}/$$f); \
 +	    (cd .. && $(INSTALL_SCRIPT) ${srcdir}/$$f ${archlibdir}/$$f); \
@@ -26,12 +26,11 @@ $NetBSD: patch-ab,v 1.1 1999/06/29 23:13:39 tron Exp $
 +install: install-archlibdir
  	@echo; echo "Installing utilities for users to run."
  	for file in ${INSTALLABLES} ; do \
--	  (cd .. && $(INSTALL_PROGRAM) lib-src/$${file} ${bindir}/$${file}) ; \
 +	  if [ $${file} = etags ] || [ $${file} = ctags ] || [ $${file} = b2m ] ; \
 +	  then \
 +	    (cd .. && $(INSTALL_PROGRAM) lib-src/$${file} ${bindir}/xemacs-$${file}) ; \
 +	  else \
-+	    (cd .. && $(INSTALL_PROGRAM) lib-src/$${file} ${bindir}/$${file}) ; \
+ 	  (cd .. && $(INSTALL_PROGRAM) lib-src/$${file} ${bindir}/$${file}) ; \
 +	  fi \
  	done
  	for file in ${INSTALLABLE_SCRIPTS} ; do \
diff --git a/editors/xemacs/patches/patch-ac b/editors/xemacs/patches/patch-ac
index 54976616eda..fe34ea27a72 100644
--- a/editors/xemacs/patches/patch-ac
+++ b/editors/xemacs/patches/patch-ac
@@ -1,9 +1,9 @@
-$NetBSD: patch-ac,v 1.1 1999/06/29 23:13:40 tron Exp $
+$NetBSD: patch-ac,v 1.2 1999/12/08 08:18:25 rh Exp $
 
---- Makefile.in.orig	Fri Nov 21 01:07:10 1997
-+++ Makefile.in	Sun Feb 22 23:22:43 1998
-@@ -467,8 +467,12 @@
- 	fi
+--- Makefile.in.orig	Sun Aug 15 03:29:45 1999
++++ Makefile.in	Wed Dec  8 09:14:11 1999
+@@ -444,8 +444,12 @@
+ 	## Note it's `xemacs' not ${PROGNAME}
  	cd ${srcdir}/etc && \
  	  for page in xemacs etags ctags gnuserv gnuclient gnuattach gnudoit; do \
 -	    ${INSTALL_DATA} ${srcdir}/etc/$${page}.1 ${mandir}/$${page}${manext} ; \
@@ -15,5 +15,5 @@ $NetBSD: patch-ac,v 1.1 1999/06/29 23:13:40 tron Exp $
 +	      ${INSTALL_MAN} ${srcdir}/etc/$${page}.1 ${mandir}/$${page}${manext} ; \
 +	    fi \
  	  done
- 	@echo "If you would like to save approximately 15M of disk space, do"
+ 	@echo "If you would like to save approximately 2M of disk space, do"
  	@echo "make gzip-el"
diff --git a/japanese/canna-lib/files/patch-sum b/japanese/canna-lib/files/patch-sum
index af1fd6a6332..5451c196c02 100644
--- a/japanese/canna-lib/files/patch-sum
+++ b/japanese/canna-lib/files/patch-sum
@@ -1,5 +1,5 @@
-$NetBSD: patch-sum,v 1.3 1999/09/06 07:25:16 sakamoto Exp $
+$NetBSD: patch-sum,v 1.4 1999/12/08 08:24:43 rh Exp $
 
-MD5 (patch-aa) = cdc53f1676a8add00d1c713e3f156681
+MD5 (patch-aa) = aca638a5b0fa561dcacb27590ff9a70a
 MD5 (patch-ab) = 9c308687cdc856ed489713dc2e929014
 MD5 (patch-ac) = a1fd7fea8cc51e12336ab061a6e2a838
diff --git a/japanese/canna-lib/patches/patch-aa b/japanese/canna-lib/patches/patch-aa
index ed1c5bfa8f5..1ef02c255a6 100644
--- a/japanese/canna-lib/patches/patch-aa
+++ b/japanese/canna-lib/patches/patch-aa
@@ -1,9 +1,8 @@
-$NetBSD: patch-aa,v 1.2 1999/08/27 04:06:58 sakamoto Exp $
+$NetBSD: patch-aa,v 1.3 1999/12/08 08:24:44 rh Exp $
 
---- Canna.conf.orig	Thu Nov 28 19:27:01 1996
-+++ Canna.conf	Fri Aug 27 10:04:28 1999
-@@ -128,27 +128,27 @@
-  * $Id: patch-aa,v 1.2 1999/08/27 04:06:58 sakamoto Exp $
+--- Canna.conf.orig	Thu Nov 28 11:27:01 1996
++++ Canna.conf	Wed Dec  8 09:21:56 1999
+@@ -129,19 +129,19 @@
   */
  
 -cannaBinDir = /usr/local/canna/bin
@@ -33,16 +32,14 @@ $NetBSD: patch-aa,v 1.2 1999/08/27 04:06:58 sakamoto Exp $
 +cannaGroup = ${CANNAGROUP}
  
  cannaOwnerGroup = -o $(cannaOwner) -g $(cannaGroup)
- 
+@@ -149,5 +149,5 @@
  pointerIntegerDef =
  
 -cannaDsoRev = 1
 +cannaDsoRev = 1.0
      /* SunOS 4.x をお使いの方で shared object を利用する場合には
              cannaDsoRev = 1.1
-     と指定してください。また、FreeBSD を利用する場合は、
-@@ -201,10 +201,9 @@
-  * インストール済みの共有ライブラリを用いて Canna の
+@@ -202,8 +202,7 @@
   * コマンド類をリンクする時は、次を YES にしてくだい。
   */
 -/* #define UseInstalledLibCanna YES */
@@ -53,9 +50,7 @@ $NetBSD: patch-aa,v 1.2 1999/08/27 04:06:58 sakamoto Exp $
 +DicDir   = ${DICT_DIR}/canna
  
  #ifdef NeXT
- #define NO_X_ENV
-@@ -239,18 +238,18 @@
-     DEPCANNALIB = $(libCannaDir)/libcanna.a
+@@ -240,16 +239,16 @@
  #endif
  # endif
 -       CANNALIB = -L$(libCannaDir) -lcanna $(DLLIB)
@@ -77,9 +72,7 @@ $NetBSD: patch-aa,v 1.2 1999/08/27 04:06:58 sakamoto Exp $
 +       CANNALIB = -Wl,-rpath,$(libCannaDir) -L$(libCannaDir) -lcanna $(DLLIB)
  #endif /* UseInstalledLibCanna */
  
- #if UseInstalledLibCanna
-@@ -259,14 +258,14 @@
- # else
+@@ -260,12 +259,12 @@
      DEPCANNALIB16 = $(libCannaDir)/libcanna16.a
  # endif
 -       CANNALIB16 = -L$(libCannaDir) -lcanna16 $(DLLIB)
@@ -96,4 +89,3 @@ $NetBSD: patch-aa,v 1.2 1999/08/27 04:06:58 sakamoto Exp $
 +       CANNALIB16 = -Wl,-rpath,$(libCannaDir) -L$(libCannaDir) -lcanna16 $(DLLIB)
  #endif /* UseInstalledLibCanna */
  
- /*