summaryrefslogtreecommitdiff
path: root/print
diff options
context:
space:
mode:
authorhauke <hauke@pkgsrc.org>2019-07-04 14:44:15 +0000
committerhauke <hauke@pkgsrc.org>2019-07-04 14:44:15 +0000
commitfec196c5b2f6b22b363ae834c140d75de6a3131a (patch)
tree4becf58d9fea0f16ce4c26f1fc52680156352bce /print
parent8866fdd7e49a1cac967461f922f2efd845e0e933 (diff)
downloadpkgsrc-fec196c5b2f6b22b363ae834c140d75de6a3131a.tar.gz
Fix the build for XEmacs. (Did this ever build?)
Tested with editors/{xemacs,emacs26}.
Diffstat (limited to 'print')
-rw-r--r--print/auctex/Makefile14
-rw-r--r--print/auctex/distinfo3
-rw-r--r--print/auctex/patches/patch-Makefile.in23
3 files changed, 35 insertions, 5 deletions
diff --git a/print/auctex/Makefile b/print/auctex/Makefile
index d345b61ae1a..06890a0bccd 100644
--- a/print/auctex/Makefile
+++ b/print/auctex/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.42 2016/08/20 12:27:32 mef Exp $
+# $NetBSD: Makefile,v 1.43 2019/07/04 14:44:15 hauke Exp $
DISTNAME= auctex-11.89
PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME}
+PKGREVISION= 1
CATEGORIES= print
MASTER_SITES= ${MASTER_SITE_GNU:=auctex/}
@@ -10,8 +11,10 @@ HOMEPAGE= http://www.gnu.org/software/auctex/
COMMENT= Enhanced LaTeX mode for Emacs
LICENSE= gnu-gpl-v3
-INSTALLATION_DIRS= ${EMACS_INFOPREFIX} \
- ${EMACS_LISPPREFIX}/auctex
+INSTALLATION_DIRS= share/doc/auctex
+INSTALLATION_DIRS+= ${EMACS_INFOPREFIX}
+INSTALLATION_DIRS+= ${EMACS_LISPPREFIX}
+INSTALLATION_DIRS+= ${EMACS_LISPPREFIX}/auctex
EMACS_MODULES= base
@@ -26,7 +29,10 @@ MESSAGE_SUBST+= LISPDIR=${EMACS_LISPPREFIX:Q}
INFO_FILES= YES
CONFIGURE_ARGS.emacs= --with-lispdir=${EMACS_LISPPREFIX}
-CONFIGURE_ARGS.xemacs= --with-packagedir=${EMACS_LISPPREFIX:C|/lisp||}
+
+# We are not building an XEmacs package!
+CONFIGURE_ARGS.xemacs= --without-packagedir
+CONFIGURE_ARGS.xemacs+= --with-lispdir=${EMACS_LISPPREFIX}
.include "../../editors/emacs/modules.mk"
diff --git a/print/auctex/distinfo b/print/auctex/distinfo
index 7e8e10da01f..23c2c46e7a6 100644
--- a/print/auctex/distinfo
+++ b/print/auctex/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.19 2016/12/18 10:31:23 mef Exp $
+$NetBSD: distinfo,v 1.20 2019/07/04 14:44:15 hauke Exp $
SHA1 (auctex-11.89.tar.gz) = 339244eee9ac932b6a6e342313ea7ea8653d86f7
RMD160 (auctex-11.89.tar.gz) = 8926fe01a469bd145ddc191eb76e63712302d14f
SHA512 (auctex-11.89.tar.gz) = a78ddefb46c1eb271646f3c4e723f49a913e391eb58263df3d3de272bc1ad5b70c0a9de682f28124aa5a48b36c030b3e83425667ee1a1973a054ff03ef1d8be9
Size (auctex-11.89.tar.gz) = 1332904 bytes
+SHA1 (patch-Makefile.in) = 9dd75aa62f8013a87f23dabbbf949520717f7952
SHA1 (patch-style_subfigure.el) = 41a4c7030a14796896ed37a649961a555406308b
diff --git a/print/auctex/patches/patch-Makefile.in b/print/auctex/patches/patch-Makefile.in
new file mode 100644
index 00000000000..8fb2cc0a25b
--- /dev/null
+++ b/print/auctex/patches/patch-Makefile.in
@@ -0,0 +1,23 @@
+$NetBSD: patch-Makefile.in,v 1.1 2019/07/04 14:44:15 hauke Exp $
+
+Do not try to install preview-latex.info when we have disabled preview
+
+--- Makefile.in.orig 2015-11-13 08:56:39.000000000 +0000
++++ Makefile.in
+@@ -50,7 +50,7 @@ MKINSTALLDIRS = ./mkinstalldirs
+ DESTDIR=
+
+ PACKAGE=auctex
+-PACKAGE_INFO=auctex preview-latex
++PACKAGE_INFO=auctex
+ EMACS=@EMACS@
+ ELCC=$(EMACS) -batch -q -no-site-file -no-init-file -l lpath.el
+ AUTOLOAD=--eval '(let ((generated-autoload-file (expand-file-name "$@"))) \
+@@ -161,6 +161,7 @@ ifeq (@preview_enabled@,yes)
+ PREVIEWSRC = @PLAT_LISP@ preview.el
+ PREVIEWELC = $(PREVIEWSRC:.el=.elc)
+ PREVIEWLATEX = test "x$(packagedir)" != xno || $(MAKE) preview-latex.el
++ PACKAGE_INFO += preview-latex
+ TEXMF = (cd latex ; $(MAKE) all)
+
+ # Install actions