diff options
| author | Shigeyuki Fukushima <shige@FreeBSD.org> | 1999-10-26 13:20:32 +0000 |
|---|---|---|
| committer | Shigeyuki Fukushima <shige@FreeBSD.org> | 1999-10-26 13:20:32 +0000 |
| commit | 5e83bd065e70271e0da138927b24fe5014055738 (patch) | |
| tree | 56e7fc7e5371e048771afba75bb93d33d3e02fcc /editors | |
| parent | Unbreak, should build after your next world. (diff) | |
Update emacs-dl patches.
Fix broken internal DOC-string.
PR: ports/14513
Submitted by: OKAZAKI Tetsurou <okazaki@be.to>
Notes
Notes:
svn path=/head/; revision=22653
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/emacs20-dl/Makefile | 12 | ||||
| -rw-r--r-- | editors/emacs20-dl/distinfo | 2 | ||||
| -rw-r--r-- | editors/emacs20-dl/files/site-init.el.tmpl | 10 | ||||
| -rw-r--r-- | editors/emacs20-dl/pkg-plist | 1 | ||||
| -rw-r--r-- | editors/emacs20-dl/scripts/configure | 9 |
5 files changed, 29 insertions, 5 deletions
diff --git a/editors/emacs20-dl/Makefile b/editors/emacs20-dl/Makefile index 79e76d9d25b4..6ee0e10ae80c 100644 --- a/editors/emacs20-dl/Makefile +++ b/editors/emacs20-dl/Makefile @@ -13,7 +13,7 @@ MASTER_SITES= ${MASTER_SITE_GNU} 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 @@ USE_XLIB= yes 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 @@ CONFIGURE_ARGS+= --with-xpg4 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 --git a/editors/emacs20-dl/distinfo b/editors/emacs20-dl/distinfo index 04de4a1cbd49..fc996b0d2856 100644 --- a/editors/emacs20-dl/distinfo +++ b/editors/emacs20-dl/distinfo @@ -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 --git a/editors/emacs20-dl/files/site-init.el.tmpl b/editors/emacs20-dl/files/site-init.el.tmpl new file mode 100644 index 000000000000..838684add65c --- /dev/null +++ b/editors/emacs20-dl/files/site-init.el.tmpl @@ -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 --git a/editors/emacs20-dl/pkg-plist b/editors/emacs20-dl/pkg-plist index 7b66f3158b16..38ada015bf01 100644 --- a/editors/emacs20-dl/pkg-plist +++ b/editors/emacs20-dl/pkg-plist @@ -1 +1,2 @@ bin/emacs-dl-%%EMACS_VER%% +share/emacs/%%EMACS_VER%%/etc/%%DOC_FILE%% diff --git a/editors/emacs20-dl/scripts/configure b/editors/emacs20-dl/scripts/configure index 545b6cd52a83..f588d1f09b77 100644 --- a/editors/emacs20-dl/scripts/configure +++ b/editors/emacs20-dl/scripts/configure @@ -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 |