Tue Dec 13 06:20:16 2011 UTC ()
editors/emacs-nox11: Revert previous

emacs-nox11 doesn't use and can't use emacs.desktop, so there is no need
to modify the file (which shouldn't even be installed).  This modification
could go on the editors/emacs port though, conditionally on without x11.


(marino)
diff -r1.32 -r1.33 pkgsrc/editors/emacs-nox11/Makefile
cvs diff -r1.32 -r1.33 pkgsrc/editors/emacs-nox11/Makefile (expand / switch to unified diff)

--- pkgsrc/editors/emacs-nox11/Makefile 2011/12/11 21:02:29 1.32
+++ pkgsrc/editors/emacs-nox11/Makefile 2011/12/13 06:20:16 1.33
@@ -1,25 +1,18 @@ @@ -1,25 +1,18 @@
1# $NetBSD: Makefile,v 1.32 2011/12/11 21:02:29 marino Exp $ 1# $NetBSD: Makefile,v 1.33 2011/12/13 06:20:16 marino Exp $
2 2
3PKGNAME= ${DISTNAME:S/-/-nox11-/} 3PKGNAME= ${DISTNAME:S/-/-nox11-/}
4 4
5CONFLICTS+= emacs-[0-9]* 5CONFLICTS+= emacs-[0-9]*
6 6
7FILESDIR= ${.CURDIR}/../../editors/emacs/files 7FILESDIR= ${.CURDIR}/../../editors/emacs/files
8PATCHDIR= ${.CURDIR}/../../editors/emacs/patches 8PATCHDIR= ${.CURDIR}/../../editors/emacs/patches
9PKGDIR= ${.CURDIR}/../../editors/emacs 9PKGDIR= ${.CURDIR}/../../editors/emacs
10 10
11.include "../../editors/emacs/Makefile.common" 11.include "../../editors/emacs/Makefile.common"
12 12
13CONFIGURE_ARGS+= --without-dbus --without-m17n-flt --without-otf \ 13CONFIGURE_ARGS+= --without-dbus --without-m17n-flt --without-otf \
14 --without-rsvg --without-x --without-xft \ 14 --without-rsvg --without-x --without-xft \
15 --without-gif --without-jpeg --without-png \ 15 --without-gif --without-jpeg --without-png \
16 --without-tiff --without-xpm 16 --without-tiff --without-xpm
17 17
18## Update emacs.desktop to launch emacs-nox11 in Terminal 
19SUBST_CLASSES+= term 
20SUBST_STAGE.term= post-patch 
21SUBST_MESSAGE.term= Enabling desktop launch in Terminal  
22SUBST_FILES.term= etc/emacs.desktop 
23SUBST_SED.term= -e 's,^Terminal=.*,Terminal=true,' 
24 
25.include "../../mk/bsd.pkg.mk" 18.include "../../mk/bsd.pkg.mk"