CVS commit: pkgsrc/print/auctex

["Hauke Fath" <hauke%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   hauke
Date:           Thu Jul  4 14:44:16 UTC 2019

Modified Files:
        pkgsrc/print/auctex: Makefile distinfo
Added Files:
        pkgsrc/print/auctex/patches: patch-Makefile.in

Log Message:
Fix the build for XEmacs. (Did this ever build?)

Tested with editors/{xemacs,emacs26}.


To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 pkgsrc/print/auctex/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/print/auctex/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/print/auctex/patches/patch-Makefile.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/print/auctex/Makefile
diff -u pkgsrc/print/auctex/Makefile:1.42 pkgsrc/print/auctex/Makefile:1.43
--- pkgsrc/print/auctex/Makefile:1.42   Sat Aug 20 12:27:32 2016
+++ pkgsrc/print/auctex/Makefile        Thu Jul  4 14:44:15 2019
@@ -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/a
 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_LISPPRE
 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"
 

Index: pkgsrc/print/auctex/distinfo
diff -u pkgsrc/print/auctex/distinfo:1.19 pkgsrc/print/auctex/distinfo:1.20
--- pkgsrc/print/auctex/distinfo:1.19   Sun Dec 18 10:31:23 2016
+++ pkgsrc/print/auctex/distinfo        Thu Jul  4 14:44:15 2019
@@ -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

Added files:

Index: pkgsrc/print/auctex/patches/patch-Makefile.in
diff -u /dev/null pkgsrc/print/auctex/patches/patch-Makefile.in:1.1
--- /dev/null   Thu Jul  4 14:44:16 2019
+++ pkgsrc/print/auctex/patches/patch-Makefile.in       Thu Jul  4 14:44:15 2019
@@ -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