Date: Thu, 24 Jun 2004 03:11:48 +0900 (JST)
From: KIMURA Yasuhiro <yasu@utahime.org>
To: FreeBSD-gnats-submit@FreeBSD.org
Subject: ports/68250: [PATCH] print/auctex : Elisp files should be installed in ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/auctex
Message-ID: <20040623181148.D9C3054FC@eastasia.home.utahime.org>
Resent-Message-ID: <200406231820.i5NIKBEs078926@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 68250
>Category: ports
>Synopsis: [PATCH] print/auctex : Elisp files should be installed in ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/auctex
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Wed Jun 23 18:20:11 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator: KIMURA Yasuhiro
>Release: FreeBSD 4.10-RELEASE i386
>Organization:
>Environment:
System: FreeBSD eastasia.home.utahime.org 4.10-RELEASE FreeBSD 4.10-RELEASE #0: Fri May 28 04:49:31 JST 2004 root@eastasia.home.utahime.org:/usr/obj/usr1/cvsup/releng_4_10/src/sys/EASTASIA i386
>Description:
Currently this port install elisp files in
${PREFIX}/${EMACS_SITE_LISPDIR}/auctex. However they include
.elc files which are byte-compiled by Emacs21. So it should be
installed in ${PREFIX}/{EMACS_VERSION_SITE_LISPDIR}/auctex.
And EMACS_NO_RUN_DEPENDS should not be set in Makefile
since byte-compiled files cannot work with other Emacsen.
I'm not sure whether PORTREVISION should be bump up in this case.
So remove it if not necessary.
>How-To-Repeat:
>Fix:
--- auctex.patch begins here ---
diff -ruN auctex.dist/Makefile auctex/Makefile
--- auctex.dist/Makefile Sat Jun 19 20:20:03 2004
+++ auctex/Makefile Thu Jun 24 02:37:22 2004
@@ -7,6 +7,7 @@
PORTNAME= auctex
PORTVERSION= 11.14
+PORTREVISION= 1
CATEGORIES= print elisp
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= ${PORTNAME}/${PORTVERSION}
@@ -15,8 +16,7 @@
COMMENT= Integrated environment for writing LaTeX using GNU Emacs
EMACS_PORT_NAME?= emacs21
-EMACS_NO_RUN_DEPENDS= yes
-LISPDIR= ${EMACS_SITE_LISPDIR}
+LISPDIR= ${EMACS_VERSION_SITE_LISPDIR}
ALL_TARGET= all contrib
INSTALL_TARGET= install install-contrib install-info
MAKE_ARGS+= lispdir=${PREFIX}/${LISPDIR}
@@ -25,6 +25,7 @@
INFO= auctex
post-patch:
+ ${REINPLACE_CMD} -e 's?%%LISPDIR%%?${LISPDIR}?g' ${WRKSRC}/Makefile
${REINPLACE_CMD} -e 's?%%PREFIX%%?${PREFIX}?g' ${WRKSRC}/tex.el
post-install:
diff -ruN auctex.dist/files/patch-aa auctex/files/patch-aa
--- auctex.dist/files/patch-aa Tue Apr 23 21:48:52 2002
+++ auctex/files/patch-aa Thu Jun 24 02:22:11 2004
@@ -1,6 +1,6 @@
---- Makefile.orig Thu Jan 24 18:55:33 2002
-+++ Makefile Mon Apr 8 04:08:24 2002
-@@ -10,7 +10,7 @@
+--- Makefile.orig Sun Dec 15 11:15:42 2002
++++ Makefile Thu Jun 24 02:16:22 2004
+@@ -10,19 +10,19 @@
##----------------------------------------------------------------------
# Where local software is found
@@ -9,7 +9,12 @@
# Where info files go.
infodir = $(prefix)/info
-@@ -22,7 +22,7 @@
+
+ # Where local lisp files go.
+-lispdir = $(prefix)/share/emacs/site-lisp
++lispdir = $(prefix)/%%LISPDIR%%
+
+ # Where the AUC TeX emacs lisp files go.
aucdir=$(lispdir)/auctex
# Name of your emacs binary
@@ -35,7 +40,7 @@
##----------------------------------------------------------------------
## BELOW THIS LINE ON YOUR OWN RISK!
-@@ -120,7 +123,7 @@
+@@ -121,7 +124,7 @@
# $(ELC) hilit-LaTeX.el # Doesn't compile without X
install-lisp: some
@@ -44,7 +49,7 @@
if [ -f $(lispdir)/tex-site.el ]; \
then \
echo "Leaving old tex-site.el alone."; \
-@@ -128,17 +131,17 @@
+@@ -129,17 +132,17 @@
sed -e 's#@AUCDIR#$(aucdir)/#' tex-site.el \
> $(lispdir)/tex-site.el ; \
fi
@@ -65,8 +70,8 @@
else true; fi ; \
touch $(aucdir)/auto/.nosearch ; \
else \
-@@ -198,9 +201,9 @@
- -(cd style; auc add `echo $(STYLESRC) | sed -e s@style/@@g` )
+@@ -192,9 +195,9 @@
+ < tex.el.orig > tex.el
cvs commit -m 'Release_$(TAG)'
cvs tag release_`echo $(TAG) | sed -e 's/[.]/_/g'`
- mkdir auctex-$(TAG)
--- auctex.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040623181148.D9C3054FC>