From owner-freebsd-ports Sun May 10 22:13:24 1998 Return-Path: Received: (from majordom@localhost) by hub.freebsd.org (8.8.8/8.8.8) id WAA12551 for freebsd-ports-outgoing; Sun, 10 May 1998 22:13:24 -0700 (PDT) (envelope-from owner-freebsd-ports@FreeBSD.ORG) Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id WAA12536 for ; Sun, 10 May 1998 22:13:20 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.8.8/8.8.5) id WAA27379; Sun, 10 May 1998 22:10:02 -0700 (PDT) Received: from kiri.toba-cmt.ac.jp (kiri.toba-cmt.ac.jp [202.26.248.91]) by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id WAA12173 for ; Sun, 10 May 1998 22:10:32 -0700 (PDT) (envelope-from kiri@kiri.toba-cmt.ac.jp) Received: (from kiri@localhost) by kiri.toba-cmt.ac.jp (8.8.8/8.8.8) id OAA01007; Mon, 11 May 1998 14:11:45 +0900 (JST) (envelope-from kiri) Message-Id: <199805110511.OAA01007@kiri.toba-cmt.ac.jp> Date: Mon, 11 May 1998 14:11:45 +0900 (JST) From: KIRIYAMA Kazuhiko Reply-To: kiri@kiri.toba-cmt.ac.jp To: FreeBSD-gnats-submit@FreeBSD.ORG X-Send-Pr-Version: 3.2 Subject: ports/6580: Update port: xemacs-mule-20.4 Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 6580 >Category: ports >Synopsis: Update port: xemacs-mule-20.4. >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: support >Submitter-Id: current-users >Arrival-Date: Sun May 10 22:10:00 PDT 1998 >Last-Modified: >Originator: Kazuhiko Kiriyama >Organization: Toba National College of Maritime Technology. Department of Electronic Mechanical Engineering >Release: FreeBSD 3.0-CURRENT i386 >Environment: >Description: I've made UPDATE ports xemacs-mule-20.4 which enables to make xemacs-mule-common-20.4 binary correctly. Update files are respecively [Add] : editors/xemacs-mule-common/patches/patch-ad [Delete] : editors/xemacs-mule-common/files/patch-ja [Update] : editors/xemacs-mule/Makefile japanese/xemacs/Makefile I put the diff from already send-pr(ports/6548) in "Fix:". >How-To-Repeat: >Fix: diff -urN submitted/editors/xemacs-mule/Makefile editors/xemacs-mule/Makefile --- submitted/editors/xemacs-mule/Makefile Wed May 6 10:38:09 1998 +++ editors/xemacs-mule/Makefile Mon May 11 09:03:19 1998 @@ -85,8 +85,6 @@ WITH_WIDGETS= --with-menubars=lucid --with-scrollbars=lucid --with-dialogs=athena MISC_OPTIONS= --with-xface --with-xpm --with-sound=native --with-pop --with-xfs -pre-patch:: - pre-build: @find ${WRKSRC} \( -name \*.orig -o -name \*~ \) -exec ${RM} -f \{} \; @${RM} -f ${WRKSRC}/lib-src/DOC* ${WRKSRC}/src/xemacs @@ -106,7 +104,6 @@ pre-clean: @(cd ${FILESDIR}; ${RM} -f ${TMPL_FILES}) - @${RM} -f ${PATCHDIR}/patch-zz @(cd ${PKGDIR}; ${RM} -f PLIST ${TMPL_FILES}) .include diff -urN submitted/editors/xemacs-mule-common/files/patch-ja editors/xemacs-mule-common/files/patch-ja --- submitted/editors/xemacs-mule-common/files/patch-ja Sun Apr 26 14:38:14 1998 +++ editors/xemacs-mule-common/files/patch-ja Thu Jan 1 09:00:00 1970 @@ -1,113 +0,0 @@ ---- lisp/packages/man.el.orig Thu Feb 19 10:58:51 1998 -+++ lisp/packages/man.el Thu Apr 23 08:44:22 1998 -@@ -29,6 +29,8 @@ - ;; - ;; [ older changelog entries removed, since they're all about code that - ;; I've deleted. ] -+;; -+;; Modified 2-Apr-98 by Yoshishige Arai - - (defgroup man nil - "Browse Unix manual pages" -@@ -242,8 +244,9 @@ - (substring args-string (match-end 0)))) - - (message "%s (running...)" args-string) -- (apply 'call-process Manual-program nil '(t nil) nil args) -- -+ (let ((coding-system-for-read 'euc-jp)) -+ (apply 'call-process Manual-program nil '(t nil) nil args) -+ ) - (if (< (buffer-size) 200) - (progn - (kill-buffer (current-buffer)) -@@ -326,6 +329,39 @@ - (Manual-delete-char 2) - (forward-char 1)) - (set-extent-face (make-extent s (point)) 'man-italic))) -+ -+ ;; -+ ;; turn underlining into italics -+ ;; -+ (goto-char (point-min)) -+ (while (search-forward "__\b\b" nil t) -+ ;; searching for underscore-backspace and then comparing the -+ ;; following chars until the sequence ends turns out to be much -+ ;; faster than searching for a regexp which matches the whole -+ ;; sequence. -+ (let ((s (match-beginning 0))) -+ (goto-char s) -+ (while (and (= (following-char) ?_) -+ (= (char-after (1+ (point))) ?\b)) -+ (Manual-delete-char 4) -+ (forward-char 1)) -+ (set-extent-face (make-extent s (point)) 'man-italic))) -+ ;; -+ ;; turn overstriking into bold -+ ;; -+ (goto-char (point-min)) -+ (while (re-search-forward "\\(\\cj\\)\\(\b\b\\1\\)" nil t) -+ ;; Surprisingly, searching for the above regexp is faster than searching -+ ;; for a backspace and then comparing the preceding and following chars, -+ ;; I presume because there are many false matches, meaning more funcalls -+ ;; to re-search-forward. -+ (let ((s (match-beginning 0))) -+ (goto-char s) -+ ;; Some systems (SGI) overstrike multiple times, eg, "M\bM\bM\bM". -+ (while (looking-at "\\(\\cj\\)\\(\b\b\\1\\)+") -+ (delete-region (+ (point) 1) (match-end 0)) -+ (forward-char 1)) -+ (set-extent-face (make-extent s (point)) 'man-bold))) - ;; - ;; turn overstriking into bold - ;; -@@ -344,9 +380,13 @@ - (set-extent-face (make-extent s (point)) 'man-bold))) - ;; - ;; hack bullets: o^H+ --> + -+ ;; ryo2 modified - (goto-char (point-min)) - (while (search-forward "\b" nil t) -- (Manual-delete-char -2)) -+ (if (equal "\b" (buffer-substring (match-end 0) (+ 1 (match-end 0)))) -+ (Manual-delete-char -1) -+ (Manual-delete-char -2) -+ )) - - (if (> (buffer-size) 100) ; minor kludge - (Manual-nuke-nroff-bs-footers)) -@@ -474,8 +514,6 @@ - (if (> (- p (point)) 4) - (delete-region (+ 2 (point)) p) - (delete-region (1+ (point)) p)) --; (and (looking-at "\n\n?\n?") --; (delete-region (match-beginning 0) (match-end 0))) - - (setq pages (cdr pages))) - ;; -@@ -516,25 +554,6 @@ - splitp nil) - - (goto-char s) -- ;; if this is a hyphenated xref, we're on the second line, 1st char now. -- (when (progn -- (beginning-of-line) -- (and (looking-at (concat "^[ \t]+" (regexp-quote name))) -- (progn -- (backward-char 1) -- (or (equal (char-before) ?-) -- (equal (char-before) ?\255))) -- (setq s (progn -- (skip-chars-backward "-\255_a-zA-Z0-9") -- (point)) -- name (buffer-substring s e)))) -- (setq splitp t) -- ;; delete the spaces and dash from `name' -- (let (i) -- (while (setq i (string-match "[-\255 \n\t]+" name i)) -- (setq name (concat (substring name 0 i) -- (substring name (match-end 0))) -- i (1+ i))))) - - ;; if there are upper case letters in the section, downcase them. - (if (string-match "(.*[A-Z]+.*)$" name) diff -urN submitted/editors/xemacs-mule-common/patches/patch-ad editors/xemacs-mule-common/patches/patch-ad --- submitted/editors/xemacs-mule-common/patches/patch-ad Thu Jan 1 09:00:00 1970 +++ editors/xemacs-mule-common/patches/patch-ad Mon May 11 09:00:52 1998 @@ -0,0 +1,113 @@ +--- lisp/packages/man.el.orig Thu Feb 19 10:58:51 1998 ++++ lisp/packages/man.el Thu Apr 23 08:44:22 1998 +@@ -29,6 +29,8 @@ + ;; + ;; [ older changelog entries removed, since they're all about code that + ;; I've deleted. ] ++;; ++;; Modified 2-Apr-98 by Yoshishige Arai + + (defgroup man nil + "Browse Unix manual pages" +@@ -242,8 +244,9 @@ + (substring args-string (match-end 0)))) + + (message "%s (running...)" args-string) +- (apply 'call-process Manual-program nil '(t nil) nil args) +- ++ (let ((coding-system-for-read 'euc-jp)) ++ (apply 'call-process Manual-program nil '(t nil) nil args) ++ ) + (if (< (buffer-size) 200) + (progn + (kill-buffer (current-buffer)) +@@ -326,6 +329,39 @@ + (Manual-delete-char 2) + (forward-char 1)) + (set-extent-face (make-extent s (point)) 'man-italic))) ++ ++ ;; ++ ;; turn underlining into italics ++ ;; ++ (goto-char (point-min)) ++ (while (search-forward "__\b\b" nil t) ++ ;; searching for underscore-backspace and then comparing the ++ ;; following chars until the sequence ends turns out to be much ++ ;; faster than searching for a regexp which matches the whole ++ ;; sequence. ++ (let ((s (match-beginning 0))) ++ (goto-char s) ++ (while (and (= (following-char) ?_) ++ (= (char-after (1+ (point))) ?\b)) ++ (Manual-delete-char 4) ++ (forward-char 1)) ++ (set-extent-face (make-extent s (point)) 'man-italic))) ++ ;; ++ ;; turn overstriking into bold ++ ;; ++ (goto-char (point-min)) ++ (while (re-search-forward "\\(\\cj\\)\\(\b\b\\1\\)" nil t) ++ ;; Surprisingly, searching for the above regexp is faster than searching ++ ;; for a backspace and then comparing the preceding and following chars, ++ ;; I presume because there are many false matches, meaning more funcalls ++ ;; to re-search-forward. ++ (let ((s (match-beginning 0))) ++ (goto-char s) ++ ;; Some systems (SGI) overstrike multiple times, eg, "M\bM\bM\bM". ++ (while (looking-at "\\(\\cj\\)\\(\b\b\\1\\)+") ++ (delete-region (+ (point) 1) (match-end 0)) ++ (forward-char 1)) ++ (set-extent-face (make-extent s (point)) 'man-bold))) + ;; + ;; turn overstriking into bold + ;; +@@ -344,9 +380,13 @@ + (set-extent-face (make-extent s (point)) 'man-bold))) + ;; + ;; hack bullets: o^H+ --> + ++ ;; ryo2 modified + (goto-char (point-min)) + (while (search-forward "\b" nil t) +- (Manual-delete-char -2)) ++ (if (equal "\b" (buffer-substring (match-end 0) (+ 1 (match-end 0)))) ++ (Manual-delete-char -1) ++ (Manual-delete-char -2) ++ )) + + (if (> (buffer-size) 100) ; minor kludge + (Manual-nuke-nroff-bs-footers)) +@@ -474,8 +514,6 @@ + (if (> (- p (point)) 4) + (delete-region (+ 2 (point)) p) + (delete-region (1+ (point)) p)) +-; (and (looking-at "\n\n?\n?") +-; (delete-region (match-beginning 0) (match-end 0))) + + (setq pages (cdr pages))) + ;; +@@ -516,25 +554,6 @@ + splitp nil) + + (goto-char s) +- ;; if this is a hyphenated xref, we're on the second line, 1st char now. +- (when (progn +- (beginning-of-line) +- (and (looking-at (concat "^[ \t]+" (regexp-quote name))) +- (progn +- (backward-char 1) +- (or (equal (char-before) ?-) +- (equal (char-before) ?\255))) +- (setq s (progn +- (skip-chars-backward "-\255_a-zA-Z0-9") +- (point)) +- name (buffer-substring s e)))) +- (setq splitp t) +- ;; delete the spaces and dash from `name' +- (let (i) +- (while (setq i (string-match "[-\255 \n\t]+" name i)) +- (setq name (concat (substring name 0 i) +- (substring name (match-end 0))) +- i (1+ i))))) + + ;; if there are upper case letters in the section, downcase them. + (if (string-match "(.*[A-Z]+.*)$" name) diff -urN submitted/japanese/xemacs/Makefile japanese/xemacs/Makefile --- submitted/japanese/xemacs/Makefile Sat May 2 15:01:20 1998 +++ japanese/xemacs/Makefile Mon May 11 09:02:46 1998 @@ -32,9 +32,6 @@ WITH_INPUT_METHOD+= --with-wnn6=no .endif -pre-patch:: - @${CP} ${FILESDIR}/patch-ja ${PATCHDIR}/patch-zz - post-install:: @${MKDIR} ${PREFIX}/lib/xemacs/site-lisp/jman @${INSTALL_DATA} ${DISTDIR}/jman.el ${PREFIX}/lib/xemacs/site-lisp/jman >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message