CVS commit: pkgsrc/editors

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

Module Name:    pkgsrc
Committed By:   hauke
Date:           Thu Sep 24 11:51:48 UTC 2020

Modified Files:
        pkgsrc/editors/xemacs: Makefile Makefile.common PLIST
        pkgsrc/editors/xemacs-current: Makefile Makefile.common PLIST
Added Files:
        pkgsrc/editors/xemacs/files: xemacs.desktop

Log Message:
editors/xemacs{,-current} - Install an xemacs.desktop file, which makes
XEmacs more easily available to X11 desktop applications.


To generate a diff of this commit:
cvs rdiff -u -r1.130 -r1.131 pkgsrc/editors/xemacs/Makefile
cvs rdiff -u -r1.34 -r1.35 pkgsrc/editors/xemacs/Makefile.common
cvs rdiff -u -r1.21 -r1.22 pkgsrc/editors/xemacs/PLIST
cvs rdiff -u -r1.104 -r1.105 pkgsrc/editors/xemacs-current/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/editors/xemacs-current/Makefile.common
cvs rdiff -u -r1.24 -r1.25 pkgsrc/editors/xemacs-current/PLIST
cvs rdiff -u -r0 -r1.1 pkgsrc/editors/xemacs/files/xemacs.desktop

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

Modified files:

Index: pkgsrc/editors/xemacs/Makefile
diff -u pkgsrc/editors/xemacs/Makefile:1.130 pkgsrc/editors/xemacs/Makefile:1.131
--- pkgsrc/editors/xemacs/Makefile:1.130        Mon Aug 31 18:09:26 2020
+++ pkgsrc/editors/xemacs/Makefile      Thu Sep 24 11:51:47 2020
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.130 2020/08/31 18:09:26 wiz Exp $
+# $NetBSD: Makefile,v 1.131 2020/09/24 11:51:47 hauke Exp $
 
 PKGNAME=       ${DISTNAME}
-PKGREVISION=   12
+PKGREVISION=   13
 COMMENT=       XEmacs text editor version 21.4
 
 # extra options for x11 support, not for sharing with xemacs-current-nox11
@@ -12,6 +12,15 @@ PKG_SUGGESTED_OPTIONS+=              x11
 
 .include "options.mk"
 
+SUBST_CLASSES+=                        desktop-file
+SUBST_STAGE.desktop-file=      pre-configure
+SUBST_MESSAGE.desktop-file=    Fixing paths in XEmacs desktop file
+SUBST_VARS.desktop-file=       PREFIX LIBDIR
+SUBST_FILES.desktop-file=      etc/xemacs.desktop
+
+INSTALLATION_DIRS+=            share/applications
+
 .include "Makefile.common"
 
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/editors/xemacs/Makefile.common
diff -u pkgsrc/editors/xemacs/Makefile.common:1.34 pkgsrc/editors/xemacs/Makefile.common:1.35
--- pkgsrc/editors/xemacs/Makefile.common:1.34  Sun Jan 26 17:31:08 2020
+++ pkgsrc/editors/xemacs/Makefile.common       Thu Sep 24 11:51:47 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.34 2020/01/26 17:31:08 rillig Exp $
+# $NetBSD: Makefile.common,v 1.35 2020/09/24 11:51:47 hauke Exp $
 #
 # used by editors/xemacs-nox11/Makefile
 # used by editors/xemacs/Makefile
@@ -95,6 +95,9 @@ INSTALL_MAKE_FLAGS+=  sitemoduledir=${DES
 
 post-extract:
        cp ${FILESDIR}/dragonfly.h ${WRKSRC}/src/s/
+.if !empty(PKG_OPTIONS:Mx11)
+       cp ${FILESDIR}/xemacs.desktop ${WRKSRC}/etc/
+.endif
 
 pre-build:
        rm -f ${WRKSRC}/etc/ctags.1.orig
@@ -105,6 +108,10 @@ post-install:
 .if defined(MANZ)
        find ${DESTDIR}${LIBDIR} -name "*.el" -type f -print | xargs ${GZIP_CMD}
 .endif
+.if !empty(PKG_OPTIONS:Mx11)
+       ${INSTALL_DATA} ${WRKSRC}/etc/xemacs.desktop \
+               ${DESTDIR}${PREFIX}/share/applications/
+.endif
 
 .include "../../databases/gdbm/buildlink3.mk"
 .include "../../mk/oss.buildlink3.mk"

Index: pkgsrc/editors/xemacs/PLIST
diff -u pkgsrc/editors/xemacs/PLIST:1.21 pkgsrc/editors/xemacs/PLIST:1.22
--- pkgsrc/editors/xemacs/PLIST:1.21    Sun Feb 15 13:13:24 2015
+++ pkgsrc/editors/xemacs/PLIST Thu Sep 24 11:51:47 2020
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.21 2015/02/15 13:13:24 hauke Exp $
+@comment $NetBSD: PLIST,v 1.22 2020/09/24 11:51:47 hauke Exp $
 bin/${DISTNAME}
 bin/ellcc
 bin/gnuattach
@@ -393,6 +393,7 @@ lib/${DISTNAME}/etc/xemacs-icon2.xpm
 lib/${DISTNAME}/etc/xemacs-icon3.xpm
 lib/${DISTNAME}/etc/xemacs-ja.1
 lib/${DISTNAME}/etc/xemacs.1
+${PLIST.x11}lib/${DISTNAME}/etc/xemacs.desktop
 lib/${DISTNAME}/etc/xemacs.xbm
 lib/${DISTNAME}/etc/xemacs.xpm
 lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/DOC
@@ -1264,6 +1265,7 @@ man/man1/gnuserv.1
 man/man1/xemacs-ctags.1
 man/man1/xemacs-etags.1
 man/man1/xemacs.1
+${PLIST.x11}share/applications/xemacs.desktop
 @pkgdir lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/modules
 @pkgdir lib/xemacs/site-modules
 @pkgdir lib/xemacs/site-lisp

Index: pkgsrc/editors/xemacs-current/Makefile
diff -u pkgsrc/editors/xemacs-current/Makefile:1.104 pkgsrc/editors/xemacs-current/Makefile:1.105
--- pkgsrc/editors/xemacs-current/Makefile:1.104        Mon Aug 31 18:09:26 2020
+++ pkgsrc/editors/xemacs-current/Makefile      Thu Sep 24 11:51:48 2020
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.104 2020/08/31 18:09:26 wiz Exp $
+# $NetBSD: Makefile,v 1.105 2020/09/24 11:51:48 hauke Exp $
 
 PKGNAME=       ${DISTNAME}
-PKGREVISION=   12
+PKGREVISION=   13
 COMMENT=       *BETA* XEmacs text editor version ${PKGVERSION_NOREV}
 
 # extra options for x11 support, not for sharing with xemacs-current-nox11
@@ -11,5 +11,18 @@ PKG_SUPPORTED_OPTIONS+=              x11 xft xface
 PKG_SUGGESTED_OPTIONS+=                x11
 
 .include "options.mk"
+
+LIBDIR=                                ${PREFIX}/lib/${DISTNAME}
+
+SUBST_CLASSES+=                        desktop-file
+SUBST_STAGE.desktop-file=      pre-configure
+SUBST_MESSAGE.desktop-file=    Fixing paths in XEmacs desktop file
+SUBST_VARS.desktop-file=       PREFIX LIBDIR
+SUBST_FILES.desktop-file=      etc/xemacs.desktop
+
+INSTALLATION_DIRS+=            share/applications
+
 .include "Makefile.common"
+
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/editors/xemacs-current/Makefile.common
diff -u pkgsrc/editors/xemacs-current/Makefile.common:1.15 pkgsrc/editors/xemacs-current/Makefile.common:1.16
--- pkgsrc/editors/xemacs-current/Makefile.common:1.15  Sun Jan 26 17:31:08 2020
+++ pkgsrc/editors/xemacs-current/Makefile.common       Thu Sep 24 11:51:48 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.15 2020/01/26 17:31:08 rillig Exp $
+# $NetBSD: Makefile.common,v 1.16 2020/09/24 11:51:48 hauke Exp $
 #
 # used by editors/xemacs-current/Makefile
 # used by editors/xemacs-current-nox11/Makefile
@@ -58,6 +58,15 @@ CFLAGS+=             -Dunix
 CPPFLAGS+=     -DTERMINFO
 .endif
 
+.if !empty(PKG_OPTIONS:Mx11)
+post-extract:
+       cp ${.CURDIR}/../../editors/xemacs/files/xemacs.desktop ${WRKSRC}/etc/
+
+post-install:
+       ${INSTALL_DATA} ${WRKSRC}/etc/xemacs.desktop \
+               ${DESTDIR}${PREFIX}/share/applications/
+.endif
+
 .include "../../databases/gdbm/buildlink3.mk"
 .include "../../devel/gmp/buildlink3.mk"
 .include "../../mk/oss.buildlink3.mk"

Index: pkgsrc/editors/xemacs-current/PLIST
diff -u pkgsrc/editors/xemacs-current/PLIST:1.24 pkgsrc/editors/xemacs-current/PLIST:1.25
--- pkgsrc/editors/xemacs-current/PLIST:1.24    Fri Nov 17 14:17:17 2017
+++ pkgsrc/editors/xemacs-current/PLIST Thu Sep 24 11:51:48 2020
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.24 2017/11/17 14:17:17 hauke Exp $
+@comment $NetBSD: PLIST,v 1.25 2020/09/24 11:51:48 hauke Exp $
 bin/ellcc
 bin/gnuattach
 bin/gnuclient
@@ -694,6 +694,7 @@ lib/${DISTNAME}/etc/xemacs-icon2.xbm
 lib/${DISTNAME}/etc/xemacs-icon2.xpm
 lib/${DISTNAME}/etc/xemacs-icon3.xpm
 lib/${DISTNAME}/etc/xemacs.1
+${PLIST.x11}lib/${DISTNAME}/etc/xemacs.desktop
 lib/${DISTNAME}/etc/xemacs.xbm
 lib/${DISTNAME}/etc/xemacs.xpm
 lib/${DISTNAME}/lisp/ChangeLog
@@ -1252,5 +1253,6 @@ lib/${DISTNAME}/lisp/x-win-sun.el
 lib/${DISTNAME}/lisp/x-win-sun.elc
 lib/${DISTNAME}/lisp/x-win-xfree86.el
 lib/${DISTNAME}/lisp/x-win-xfree86.elc
+${PLIST.x11}share/applications/xemacs.desktop
 @pkgdir lib/xemacs/site-lisp
 @pkgdir lib/xemacs/site-modules

Added files:

Index: pkgsrc/editors/xemacs/files/xemacs.desktop
diff -u /dev/null pkgsrc/editors/xemacs/files/xemacs.desktop:1.1
--- /dev/null   Thu Sep 24 11:51:48 2020
+++ pkgsrc/editors/xemacs/files/xemacs.desktop  Thu Sep 24 11:51:47 2020
@@ -0,0 +1,12 @@
+# $NetBSD: xemacs.desktop,v 1.1 2020/09/24 11:51:47 hauke Exp $
+
+[Desktop Entry]
+Type=Application
+Name=XEmacs
+GenericName=Advanced Text Editor
+Comment=Highly customizable open source text editor and application development system
+MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
+Exec=@PREFIX@/bin/xemacs %F
+Icon=@LIBDIR@/etc/xemacs-icon.xpm
+Categories=Development;Office;System;Utility
+StartupWMClass=XEmacs