From owner-freebsd-ports-bugs@FreeBSD.ORG Sat May 21 07:01:10 2005 Return-Path: Delivered-To: freebsd-ports-bugs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 201C016A4CE; Sat, 21 May 2005 07:01:10 +0000 (GMT) Received: from utahime.as.wakwak.ne.jp (utahime.as.wakwak.ne.jp [61.205.238.40]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6770C43D64; Sat, 21 May 2005 07:01:08 +0000 (GMT) (envelope-from yasu@utahime.org) Received: from eastasia.home.utahime.org (eastasia.home.utahime.org [192.168.174.1]) by utahime.as.wakwak.ne.jp (Postfix) with ESMTP id 2AA85B87C; Sat, 21 May 2005 16:01:07 +0900 (JST) Received: from localhost.home.utahime.org (localhost.home.utahime.org [127.0.0.1])06F9054DF; Sat, 21 May 2005 16:01:07 +0900 (JST) Received: from eastasia.home.utahime.org (localhost.home.utahime.org [127.0.0.1])20025-17214433; Sat, 21 May 2005 16:01:06 +0900 Received: from localhost (angel.home.utahime.org [192.168.174.4]) by eastasia.home.utahime.org (Postfix) with ESMTP id C9C5E54DE; Sat, 21 May 2005 16:01:06 +0900 (JST) Date: Sat, 21 May 2005 16:00:47 +0900 (JST) Message-Id: <20050521.160047.15215470.yasu@utahime.org> To: FreeBSD-gnats-submit@FreeBSD.org, freebsd-ports-bugs@FreeBSD.org, hrs@FreeBSD.org From: KIMURA Yasuhiro In-Reply-To: <200505050700.j4570FCN063393@freefall.freebsd.org> References: <20050505065340.9102C551A@eastasia.home.utahime.org> <200505050700.j4570FCN063393@freefall.freebsd.org> X-Mailer: Mew version 4.2.50 on Emacs 21.4 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-AntiVirus: checked by AntiVir MailGate (version: 2.0.2-14; AVE: 6.30.0.12; VDF: 6.30.0.191; host: eastasia.home.utahime.org) Subject: Re: ports/80644: [PATCH] editors/psgml*: Install emacs lisp files into version specific site-lisp directory X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 21 May 2005 07:01:10 -0000 Sato-san: Thank you commiting my patch. But I found following additional problems: * "@prefix@" in psgml.el and psgml.texi is not properly replaced. * Re-formatting is needed after updating *.texi files. So please apply patch bellow, and remove zero-sized scripts/configure. Index: Makefile =================================================================== RCS file: /net/cvsup/cvsroot/ports/editors/psgml/Makefile,v retrieving revision 1.26 diff -u -r1.26 Makefile --- Makefile 12 May 2005 20:27:08 -0000 1.26 +++ Makefile 21 May 2005 06:34:06 -0000 @@ -7,7 +7,7 @@ PORTNAME= psgml PORTVERSION= 1.3.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= editors elisp MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= psgml @@ -20,6 +20,10 @@ MAINTAINER?= hrs@FreeBSD.org COMMENT?= A major mode for editing SGML and XML documents for emacs21 +USE_REINPLACE= yes + +ALL_TARGET= all info + INFO= psgml psgml-api PSGML_STARTUPEL= psgml-startup.el @@ -58,6 +62,11 @@ @${FALSE} .endif +post-configure: +.for f in psgml.el psgml.texi + ${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/$f +.endfor + post-install: cd ${WRKSRC} && ${MAKE} install-info ${INSTALL_DATA} ${WRKDIR}/${PSGML_STARTUPEL} \ Index: files/patch-ac =================================================================== RCS file: /net/cvsup/cvsroot/ports/editors/psgml/files/patch-ac,v retrieving revision 1.2 diff -u -r1.2 patch-ac --- files/patch-ac 4 Jul 2003 14:28:43 -0000 1.2 +++ files/patch-ac 21 May 2005 05:50:56 -0000 @@ -1,29 +1,29 @@ ---- psgml.el.orig Wed May 21 14:47:45 2003 -+++ psgml.el Wed May 21 15:44:47 2003 -@@ -340,7 +340,7 @@ +--- psgml.el.orig Sat May 21 14:39:55 2005 ++++ psgml.el Sat May 21 14:45:01 2005 +@@ -381,7 +381,7 @@ (put 'sgml-system-path 'sgml-type 'file-list) (defvar sgml-public-map (or (sgml-parse-colon-path (getenv "SGML_PATH")) - '("%S" "/usr/local/lib/sgml/%o/%c/%d" )) -+ '("%S" "@prefix@/share/sgml/%o/%c/%d" )) ++ '("%S" "%%PREFIX%%/share/sgml/%o/%c/%d" )) "*Mapping from public identifiers to file names. This is a list of possible file names. To find the file for a public identifier the elements of the list are used one at the time from the -@@ -366,13 +366,15 @@ +@@ -407,13 +407,15 @@ (defvar sgml-catalog-files (or (delete nil (sgml-parse-colon-path (getenv "SGML_CATALOG_FILES"))) - '("catalog" "/usr/local/lib/sgml/catalog")) -+ '("catalog" "@prefix@/share/sgml/catalog" -+ "@prefix@/share/xml/catalog")) ++ '("catalog" "%%PREFIX%%/share/sgml/catalog" ++ "%%PREFIX%%/share/xml/catalog")) "*List of catalog entry files. The files are in the format defined in the SGML Open Draft Technical Resolution on Entity Management.") (put 'sgml-catalog-files 'sgml-type 'file-list) -(defvar sgml-ecat-files '("ECAT" "~/sgml/ECAT" "/usr/local/lib/sgml/ECAT") -+(defvar sgml-ecat-files '("ECAT" "~/sgml/ECAT" "@prefix@/share/sgml/ECAT" -+ "@prefix@/share/xml/ECAT") ++(defvar sgml-ecat-files '("ECAT" "~/sgml/ECAT" "%%PREFIX%%/share/sgml/ECAT" ++ "%%PREFIX%%/share/xml/ECAT") "*List of catalog files for PSGML.") (put 'sgml-ecat-files 'sgml-type 'file-list) Index: files/patch-ad =================================================================== RCS file: /net/cvsup/cvsroot/ports/editors/psgml/files/patch-ad,v retrieving revision 1.2 diff -u -r1.2 patch-ad --- files/patch-ad 16 Oct 1999 11:57:57 -0000 1.2 +++ files/patch-ad 21 May 2005 06:01:20 -0000 @@ -1,6 +1,18 @@ ---- Makefile.in.orig Sun Oct 10 23:12:40 1999 -+++ Makefile.in Sat Oct 16 20:24:14 1999 -@@ -31,6 +31,7 @@ +--- Makefile.in.orig Sun Mar 6 01:23:40 2005 ++++ Makefile.in Sat May 21 14:59:24 2005 +@@ -25,12 +25,19 @@ + all: + rm -f *.elc ; $(EMACS) $(FLAGS) -f psgml-compile-files + ++info: ++ for p in psgml psgml-api; do \ ++ $(EMACS) -batch -q -no-site-file -l texinfmt \ ++ -f batch-texinfo-format $$p.texi; \ ++ done ++ + + install: compile + $(SHELL) mkinstalldirs $(lispdir) for p in *.elc; do \ echo " $(INSTALL_DATA) $$p $(lispdir)/$$p"; \ $(INSTALL_DATA) $$p $(lispdir)/$$p; \ @@ -8,7 +20,7 @@ done $(INSTALL_DATA) iso88591.map $(lispdir) -@@ -42,8 +43,8 @@ +@@ -39,8 +46,8 @@ $(INSTALL_DATA) psgml-api.info $(infodir) if $(SHELL) -c 'install-info --version' \ >/dev/null 2>&1; then \ Index: files/patch-ae =================================================================== RCS file: /net/cvsup/cvsroot/ports/editors/psgml/files/patch-ae,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 patch-ae --- files/patch-ae 12 Feb 1999 14:43:42 -0000 1.1.1.1 +++ files/patch-ae 21 May 2005 05:52:15 -0000 @@ -1,6 +1,7 @@ ---- psgml.texi.orig Mon Nov 16 06:45:07 1998 -+++ psgml.texi Sat Jan 23 21:10:21 1999 -@@ -11,10 +11,9 @@ +--- psgml.texi.orig Sun Mar 6 01:23:40 2005 ++++ psgml.texi Sat May 21 14:46:06 2005 +@@ -10,11 +10,10 @@ + @c $Id: psgml.texi,v 1.8 2005/03/02 19:44:20 lenst Exp $ @ifinfo -@format @@ -14,34 +15,34 @@ @end ifinfo @ifinfo -@@ -401,10 +400,10 @@ +@@ -398,10 +397,10 @@ @code{SGML_PATH}. Given the public identifier above and the file name template -@samp{/usr/local/lib/sgml/%o/%c/%d}, the resulting file name is -+@samp{@prefix@/share/sgml/%o/%c/%d}, the resulting file name is ++@samp{%%PREFIX%%/share/sgml/%o/%c/%d}, the resulting file name is @example -/usr/local/lib/sgml/ISO_8879:1986/entities/Added_Latin_1 -+@prefix@/share/sgml/ISO_8879:1986/entities/Added_Latin_1 ++%%PREFIX%%/share/sgml/ISO_8879:1986/entities/Added_Latin_1 @end example Note: blanks are transliterated to @samp{_} (and also @samp{/} to -@@ -420,7 +419,7 @@ +@@ -417,7 +416,7 @@ is undefined the default is @lisp -("CATALOG" "/usr/local/lib/sgml/CATALOG") -+("catalog" "@prefix@/share/sgml/catalog") ++("catalog" "%%PREFIX%%/share/sgml/catalog") @end lisp @end defopt -@@ -448,7 +447,7 @@ +@@ -445,7 +444,7 @@ environment variable is undefined the default is @lisp -("%S" "/usr/local/lib/sgml/%o/%c/%d") -+("%S" "@prefix@/share/sgml/%o/%c/%d") ++("%S" "%%PREFIX%%/share/sgml/%o/%c/%d") @end lisp @c Mapping from public identifiers to file names. @end defopt Index: scripts/configure =================================================================== RCS file: scripts/configure diff -N scripts/configure