Mon Aug 11 08:51:05 2008 UTC ()
If the Emacs flavour is "xemacs", don't pull in the www/w3 support, pull in
"xemacs-packages" instead.  Also, make sure that the Lisp installation
directory is correct for all flavours.

Patch from PR39287 from Anthony Mallet, with minor modification to pull in
"xemacs-packages" as a replacement for "www/w3".


(dsainty)
diff -r1.4 -r1.5 pkgsrc/devel/doxymacs/Makefile
cvs diff -r1.4 -r1.5 pkgsrc/devel/doxymacs/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/doxymacs/Makefile 2007/08/05 05:19:19 1.4
+++ pkgsrc/devel/doxymacs/Makefile 2008/08/11 08:51:05 1.5
@@ -1,30 +1,34 @@ @@ -1,30 +1,34 @@
1# $NetBSD: Makefile,v 1.4 2007/08/05 05:19:19 dsainty Exp $ 1# $NetBSD: Makefile,v 1.5 2008/08/11 08:51:05 dsainty Exp $
2# 2#
3 3
4DISTNAME= doxymacs-1.8.0 4DISTNAME= doxymacs-1.8.0
5PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME} 5PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME}
6CATEGORIES= devel 6CATEGORIES= devel
7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=doxymacs/} 7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=doxymacs/}
8 8
9MAINTAINER= dsainty@NetBSD.org 9MAINTAINER= dsainty@NetBSD.org
10HOMEPAGE= http://doxymacs.sourceforge.net/ 10HOMEPAGE= http://doxymacs.sourceforge.net/
11COMMENT= Doxygen editing support for Emacs 11COMMENT= Doxygen editing support for Emacs
12 12
13.include "../../mk/emacs.mk" 13.include "../../mk/emacs.mk"
14 14
15# 15#
16# "www/w3" (Emacs/W3) currently does not work with Emacs 22. Emacs/W3 16# "www/w3" (Emacs/W3) currently does not work with Emacs 22. Emacs/W3
17# is documented as a requirement for Doxymacs, but it appears that it 17# is documented as a requirement for Doxymacs, but it appears that it
18# is only used for the url-* support introduced in Emacs/W3. 18# is only used for the url-* support introduced in Emacs/W3.
19# Fortunately, the url-* support from Emacs/W3 has been integrated 19# Fortunately, the url-* support from Emacs/W3 has been integrated
20# into Emacs version 22. 20# into Emacs version 22. The same support for XEmacs is available in
 21# editors/xemacs-packages.
21# 22#
22.if ${EMACS_VERSION_MAJOR} <= 21 23.if ${EMACS_FLAVOR} == xemacs
 24DEPENDS+= xemacs-packages-[0-9]*:../../editors/xemacs-packages
 25.elif ${EMACS_VERSION_MAJOR} <= 21
23DEPENDS+= w3-[0-9]*:../../www/w3 26DEPENDS+= w3-[0-9]*:../../www/w3
24.endif 27.endif
25 28
26GNU_CONFIGURE= yes 29GNU_CONFIGURE= yes
27CONFIGURE_ENV+= EMACS=${EMACS_BIN:Q} 30CONFIGURE_ENV+= EMACS=${EMACS_BIN:Q}
 31CONFIGURE_ARGS+= --with-lispdir=${EMACS_LISPPREFIX:Q}
28 32
29.include "../../textproc/libxml2/buildlink3.mk" 33.include "../../textproc/libxml2/buildlink3.mk"
30.include "../../mk/bsd.pkg.mk" 34.include "../../mk/bsd.pkg.mk"