SF.net SVN: gar:[25846] csw/mgar/pkg/emacs/trunk/Makefile

[pfelecan at users.sourceforge.net]

Revision: 25846
          http://sourceforge.net/p/gar/code/25846
Author:   pfelecan
Date:     2016-07-15 11:05:13 +0000 (Fri, 15 Jul 2016)
Log Message:
-----------
Merge e-lisp sources in the common package as the separation doesn't
work in all cases. Note that the other distributions, especially in
the GNU/Linux world do the same.

Modified Paths:
--------------
    csw/mgar/pkg/emacs/trunk/Makefile

Modified: csw/mgar/pkg/emacs/trunk/Makefile
===================================================================
--- csw/mgar/pkg/emacs/trunk/Makefile	2016-07-14 14:23:06 UTC (rev 25845)
+++ csw/mgar/pkg/emacs/trunk/Makefile	2016-07-15 11:05:13 UTC (rev 25846)
@@ -133,11 +133,8 @@
 PACKAGES							=	CSWemacs-common
 SPKG_DESC_CSWemacs-common			=	$(DESCRIPTION) - architecture neutral common components
 CATALOGNAME_CSWemacs-common			=	emacs_common
-# as we use alternatives, we need to obsolete emacs_chooser;
-# emacs_common, being the root dependence of all emacs related
-# packages, seems the best place to do it.
-OBSOLETED_BY_CSWemacs-common		+=	CSWemacscommon
-CATALOGNAME_CSWemacscommon			=	emacscommon_stub
+OBSOLETED_BY_CSWemacs-common		+=	CSWemacs-el
+CATALOGNAME_CSWemacs-el				=	emacs-el_stub
 # this is to be done only for this sub-package but I don't know how to
 # specialize the variable:
 EXTRA_TEXINFO						=	$(infodir)/.*
@@ -206,13 +203,6 @@
 CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/share|root/opt/csw/share/emacs/24.5/lisp/org/org-odt.elc
 CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/share|root/opt/csw/share/emacs/24.5/lisp/org/org-version.el
 
-PACKAGES						+=	CSWemacs-el
-SPKG_DESC_CSWemacs-el			=	$(DESCRIPTION) - elisp sources
-CATALOGNAME_CSWemacs-el			=	emacs_el
-RUNTIME_DEP_PKGS_CSWemacs-el	=	CSWemacs-common
-PKGFILES_CSWemacs-el			=	/opt/csw/share/emacs/$(VERSION)/.*[.]el
-ARCHALL_CSWemacs-el				=	1
-
 PACKAGES								+=	CSWemacs-bin-common
 SPKG_DESC_CSWemacs-bin-common			=	$(DESCRIPTION) - common binaries
 CATALOGNAME_CSWemacs-bin-common			=	emacs_bin_common

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.