Skip site navigation (1)Skip section navigation (2) 
Date:      25 Oct 1999 10:43:12 -0000
From:      okazaki@be.to
To:        FreeBSD-gnats-submit@freebsd.org
Subject:   ports/14513: editors/emacs20-dl modification request about DOC-string file.
Message-ID:  <19991025104312.22224.qmail@dolphin.be.to>
next in thread | raw e-mail | index | archive | help 

>Number:         14513
>Category:       ports
>Synopsis:       editors/emacs20-dl modification request about DOC-string file.
>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 25 03:50:00 PDT 1999
>Closed-Date:
>Last-Modified:
>Originator:     OKAZAKI Tetsurou
>Release:        FreeBSD 3.3-STABLE i386
>Organization:
Unknown
>Environment:

	

>Description:

	The emacs-dl-20.4 loads its internal DOC-string file from
	${PREFIX}/share/emacs/20.4/etc/DOC-20.4.1, but this file
	is built and installed for emacs-20.4, not emacs-dl-20.4.
	So some texts displayed by describe-{function, mode, variable}
	and so on are broken in the emacs-dl-20.4 world.

>How-To-Repeat:

	Invoke emacs-dl-20.4,

	  % emacs-dl-20.4 -q

	then display some descriptions.

	  C-h f texinfo-mode

>Fix:
	
	Apply this patch, thanks.

diff -urN /usr/ports/editors/emacs20-dl/Makefile emacs20-dl/Makefile
--- /usr/ports/editors/emacs20-dl/Makefile	Thu Sep  2 07:50:48 1999
+++ emacs20-dl/Makefile	Mon Oct 25 18:57:55 1999
@@ -13,7 +13,7 @@
 MASTER_SITE_SUBDIR=	emacs
 
 PATCH_SITES=	http://www.etl.go.jp/~tomo/comp/emacsen/
-PATCHFILES=	emacs-20.4-dl.diff.gz
+PATCHFILES=	emacs-20.4-dl3.diff.gz
 PATCH_DIST_STRIP= -p1
 
 MAINTAINER=	shige@FreeBSD.org
@@ -32,7 +32,13 @@
 CONFIGURE_ARGS= --with-x=no --with-pop
 .endif
 
-PLIST_SUB=	EMACS_VER=${EMACS_VER} EMACS_ARCH=${CONFIGURE_TARGET}
+DOC_FILE=	DOC-DL-${EMACS_VER}.1
+
+PLIST_SUB=	EMACS_VER=${EMACS_VER} EMACS_ARCH=${CONFIGURE_TARGET} \
+		DOC_FILE=${DOC_FILE}
+
+SCRIPTS_ENV=	SED=${SED} MV=${MV} \
+		DOC_FILE=${DOC_FILE}
 
 .if defined(USE_XPG4)
 .if (${USE_XPG4} == "YES" || ${USE_XPG4} == "yes")
@@ -42,8 +48,10 @@
 
 pre-build:
 	@${RM} -rf ${WRKSRC}/info/*
+	@${LN} -sf DOC ${WRKSRC}/etc/${DOC_FILE}
 
 do-install:
 	@${INSTALL} -c -s -m 555 -o root -g wheel ${WRKSRC}/src/emacs ${PREFIX}/bin/emacs-dl-${EMACS_VER}
+	@${INSTALL_DATA} ${WRKSRC}/etc/DOC ${PREFIX}/share/emacs/${EMACS_VER}/etc/${DOC_FILE}
 
 .include <bsd.port.mk>
diff -urN /usr/ports/editors/emacs20-dl/files/md5 emacs20-dl/files/md5
--- /usr/ports/editors/emacs20-dl/files/md5	Mon Aug  9 22:35:58 1999
+++ emacs20-dl/files/md5	Tue Oct 12 08:54:16 1999
@@ -1,2 +1,2 @@
 MD5 (emacs-20.4.tar.gz) = 695614f204d918db617ba3ae849b273d
-MD5 (emacs-20.4-dl.diff.gz) = 21c1a6b214efcef4cef975620a487681
+MD5 (emacs-20.4-dl3.diff.gz) = c7d5891607236066cd1a7f187d6100bc
diff -urN /usr/ports/editors/emacs20-dl/files/site-init.el.tmpl emacs20-dl/files/site-init.el.tmpl
--- /usr/ports/editors/emacs20-dl/files/site-init.el.tmpl	Thu Jan  1 09:00:00 1970
+++ emacs20-dl/files/site-init.el.tmpl	Mon Oct 25 19:02:11 1999
@@ -0,0 +1,10 @@
+;;; site-init.el -- site-dependent initialization file
+
+;;
+;; Init file for FreeBSD port: emacs20-dl
+;;
+
+; change a default file name of the internal DOC-string.
+(Snarf-documentation "%%DOC_FILE%%")
+
+;;; site-init.el ends here
diff -urN /usr/ports/editors/emacs20-dl/pkg/PLIST emacs20-dl/pkg/PLIST
--- /usr/ports/editors/emacs20-dl/pkg/PLIST	Sun Dec 13 23:27:06 1998
+++ emacs20-dl/pkg/PLIST	Mon Oct 25 18:49:28 1999
@@ -1 +1,2 @@
 bin/emacs-dl-%%EMACS_VER%%
+share/emacs/%%EMACS_VER%%/etc/%%DOC_FILE%%
diff -urN /usr/ports/editors/emacs20-dl/scripts/configure emacs20-dl/scripts/configure
--- /usr/ports/editors/emacs20-dl/scripts/configure	Sun Dec 13 23:27:06 1998
+++ emacs20-dl/scripts/configure	Mon Oct 25 18:56:25 1999
@@ -1,9 +1,14 @@
 #! /bin/sh
 
+for f in site-init.el; do
+	${SED} -e "s,%%DOC_FILE%%,${DOC_FILE},g" \
+		< ${FILESDIR}/${f}.tmpl > ${WRKSRC}/lisp/${f}
+done
+
 cd ${WRKSRC}
 
 if [ -f /usr/lib/aout/crt0.o -a ! -f /usr/lib/crt0.o ]; then
-    sed -e "s|/usr/lib/crt0\.o|/usr/lib/aout/crt0.o|g" \
+    ${SED} -e "s|/usr/lib/crt0\.o|/usr/lib/aout/crt0.o|g" \
 	src/s/freebsd.h > src/s/freebsd.h.new || exit
-    mv -f src/s/freebsd.h.new src/s/freebsd.h
+    ${MV} -f src/s/freebsd.h.new src/s/freebsd.h
 fi

>Release-Note:
>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?19991025104312.22224.qmail>