[csw-devel] SF.net SVN: gar:[18116] csw/mgar/pkg/emacs/trunk/Makefile

pfelecan at users.sourceforge.net pfelecan at users.sourceforge.net
Fri May 25 11:36:55 CEST 2012


Revision: 18116
          http://gar.svn.sourceforge.net/gar/?rev=18116&view=rev
Author:   pfelecan
Date:     2012-05-25 09:36:55 +0000 (Fri, 25 May 2012)
Log Message:
-----------
refinement of overrides and use VERSION macro wherever possible.

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

Modified: csw/mgar/pkg/emacs/trunk/Makefile
===================================================================
--- csw/mgar/pkg/emacs/trunk/Makefile	2012-05-25 09:24:38 UTC (rev 18115)
+++ csw/mgar/pkg/emacs/trunk/Makefile	2012-05-25 09:36:55 UTC (rev 18116)
@@ -111,16 +111,17 @@
 ALTERNATIVE_gtk				=	$(bindir)/emacs emacs $(bindir)/emacs-gtk 100
 ALTERNATIVE_nox				=	$(bindir)/emacs emacs $(bindir)/emacs-nox 300
 
-PACKAGES					=	CSWemacs-common
-SPKG_DESC_CSWemacs-common	=	$(DESCRIPTION) - architecture neutral common components
-CATALOGNAME_CSWemacs-common		=	emacs_common
+PACKAGES							=	CSWemacs-common
+SPKG_DESC_CSWemacs-common			=	$(DESCRIPTION) - architecture neutral common components
+CATALOGNAME_CSWemacs-common			=	emacs_common
+CHECKPKG_OVERRIDES_CSWemacs-common	+=	missing-dependency|CSWemacscommon
 # 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	=	CSWemacschooser
-OBSOLETED_BY_CSWemacs-common	+=	CSWemacscommon
-CATALOGNAME_CSWemacscommon		=	emacscommon_stub
-ARCHALL_CSWemacs-common			=	1
+OBSOLETED_BY_CSWemacs-common		=	CSWemacschooser
+OBSOLETED_BY_CSWemacs-common		+=	CSWemacscommon
+CATALOGNAME_CSWemacscommon			=	emacscommon_stub
+ARCHALL_CSWemacs-common				=	1
 
 PACKAGES					+=	CSWemacs-el
 SPKG_DESC_CSWemacs-el		=	$(DESCRIPTION) - elisp sources
@@ -145,20 +146,20 @@
 CHECKPKG_OVERRIDES_CSWemacs-common		+=	file-with-bad-content|/usr/share|root/opt/csw/share/info/emacs-6
 CHECKPKG_OVERRIDES_CSWemacs-common		+=	file-with-bad-content|/usr/share|root/opt/csw/share/info/eintr-2
 CHECKPKG_OVERRIDES_CSWemacs-common		+=	file-with-bad-content|/usr/share|root/opt/csw/share/info/efaq
-CHECKPKG_OVERRIDES_CSWemacs-common		+=	file-with-bad-content|/usr/share|root/opt/csw/share/emacs/23.4/etc/compilation.txt
-CHECKPKG_OVERRIDES_CSWemacs-common		+=	file-with-bad-content|/usr/share|root/opt/csw/share/emacs/23.4/etc/PROBLEMS
-CHECKPKG_OVERRIDES_CSWemacs-common		+=	file-with-bad-content|/usr/share|root/opt/csw/share/emacs/23.4/etc/DOC-23.4.1
-CHECKPKG_OVERRIDES_CSWemacs-common		+=	file-with-bad-content|/usr/share|root/opt/csw/share/emacs/23.4/lisp/hfy-cmap.elc
-CHECKPKG_OVERRIDES_CSWemacs-common		+=	file-with-bad-content|/usr/share|root/opt/csw/share/emacs/23.4/lisp/printing.elc
-CHECKPKG_OVERRIDES_CSWemacs-common		+=	file-with-bad-content|/usr/share|root/opt/csw/share/emacs/23.4/lisp/woman.elc
-CHECKPKG_OVERRIDES_CSWemacs-common		+=	file-with-bad-content|/usr/share|root/opt/csw/share/emacs/23.4/lisp/cedet/semantic/bovine/scm.elc
-CHECKPKG_OVERRIDES_CSWemacs-common		+=	file-with-bad-content|/usr/share|root/opt/csw/share/emacs/23.4/lisp/international/mule-cmds.elc
-CHECKPKG_OVERRIDES_CSWemacs-common		+=	file-with-bad-content|/usr/share|root/opt/csw/share/emacs/23.4/lisp/international/eucjp-ms.el
-CHECKPKG_OVERRIDES_CSWemacs-common		+=	file-with-bad-content|/usr/share|root/opt/csw/share/emacs/23.4/lisp/term/x-win.elc
-CHECKPKG_OVERRIDES_CSWemacs-common		+=	file-with-bad-content|/usr/share|root/opt/csw/share/emacs/23.4/lisp/textmodes/ispell.elc
-CHECKPKG_OVERRIDES_CSWemacs-common		+=	file-with-bad-content|/usr/share|root/opt/csw/share/emacs/23.4/lisp/mh-e/mh-xface.elc
-CHECKPKG_OVERRIDES_CSWemacs-common		+=	file-with-bad-content|/usr/share|root/opt/csw/share/emacs/23.4/lisp/mh-e/mh-alias.elc
-CHECKPKG_OVERRIDES_CSWemacs-common		+=	file-with-bad-content|/usr/share|root/opt/csw/share/emacs/23.4/lisp/gnus/gnus-art.elc
+CHECKPKG_OVERRIDES_CSWemacs-common		+=	file-with-bad-content|/usr/share|root/opt/csw/share/emacs/$(VERSION)/etc/compilation.txt
+CHECKPKG_OVERRIDES_CSWemacs-common		+=	file-with-bad-content|/usr/share|root/opt/csw/share/emacs/$(VERSION)/etc/PROBLEMS
+CHECKPKG_OVERRIDES_CSWemacs-common		+=	file-with-bad-content|/usr/share|root/opt/csw/share/emacs/$(VERSION)/etc/DOC-$(VERSION).1
+CHECKPKG_OVERRIDES_CSWemacs-common		+=	file-with-bad-content|/usr/share|root/opt/csw/share/emacs/$(VERSION)/lisp/hfy-cmap.elc
+CHECKPKG_OVERRIDES_CSWemacs-common		+=	file-with-bad-content|/usr/share|root/opt/csw/share/emacs/$(VERSION)/lisp/printing.elc
+CHECKPKG_OVERRIDES_CSWemacs-common		+=	file-with-bad-content|/usr/share|root/opt/csw/share/emacs/$(VERSION)/lisp/woman.elc
+CHECKPKG_OVERRIDES_CSWemacs-common		+=	file-with-bad-content|/usr/share|root/opt/csw/share/emacs/$(VERSION)/lisp/cedet/semantic/bovine/scm.elc
+CHECKPKG_OVERRIDES_CSWemacs-common		+=	file-with-bad-content|/usr/share|root/opt/csw/share/emacs/$(VERSION)/lisp/international/mule-cmds.elc
+CHECKPKG_OVERRIDES_CSWemacs-common		+=	file-with-bad-content|/usr/share|root/opt/csw/share/emacs/$(VERSION)/lisp/international/eucjp-ms.el
+CHECKPKG_OVERRIDES_CSWemacs-common		+=	file-with-bad-content|/usr/share|root/opt/csw/share/emacs/$(VERSION)/lisp/term/x-win.elc
+CHECKPKG_OVERRIDES_CSWemacs-common		+=	file-with-bad-content|/usr/share|root/opt/csw/share/emacs/$(VERSION)/lisp/textmodes/ispell.elc
+CHECKPKG_OVERRIDES_CSWemacs-common		+=	file-with-bad-content|/usr/share|root/opt/csw/share/emacs/$(VERSION)/lisp/mh-e/mh-xface.elc
+CHECKPKG_OVERRIDES_CSWemacs-common		+=	file-with-bad-content|/usr/share|root/opt/csw/share/emacs/$(VERSION)/lisp/mh-e/mh-alias.elc
+CHECKPKG_OVERRIDES_CSWemacs-common		+=	file-with-bad-content|/usr/share|root/opt/csw/share/emacs/$(VERSION)/lisp/gnus/gnus-art.elc
 CHECKPKG_OVERRIDES_CSWemacs-common		+=	file-with-bad-content|/usr/local|root/opt/csw/share/info/elisp-3
 CHECKPKG_OVERRIDES_CSWemacs-common		+=	file-with-bad-content|/usr/local|root/opt/csw/share/info/elisp-9
 CHECKPKG_OVERRIDES_CSWemacs-common		+=	file-with-bad-content|/usr/local|root/opt/csw/share/info/emacs-4
@@ -178,33 +179,33 @@
 CHECKPKG_OVERRIDES_CSWemacs-common		+=	file-with-bad-content|/usr/local|root/opt/csw/share/info/gnus-4
 CHECKPKG_OVERRIDES_CSWemacs-common		+=	file-with-bad-content|/usr/local|root/opt/csw/share/info/idlwave
 CHECKPKG_OVERRIDES_CSWemacs-common		+=	file-with-bad-content|/usr/local|root/opt/csw/share/info/efaq
-CHECKPKG_OVERRIDES_CSWemacs-common		+=	file-with-bad-content|/usr/local|root/opt/csw/share/emacs/23.4/etc/MH-E-NEWS
-CHECKPKG_OVERRIDES_CSWemacs-common		+=	file-with-bad-content|/usr/local|root/opt/csw/share/emacs/23.4/etc/NEWS.20
-CHECKPKG_OVERRIDES_CSWemacs-common		+=	file-with-bad-content|/usr/local|root/opt/csw/share/emacs/23.4/etc/emacs.bash
-CHECKPKG_OVERRIDES_CSWemacs-common		+=	file-with-bad-content|/usr/local|root/opt/csw/share/emacs/23.4/etc/MACHINES
-CHECKPKG_OVERRIDES_CSWemacs-common		+=	file-with-bad-content|/usr/local|root/opt/csw/share/emacs/23.4/etc/PROBLEMS
-CHECKPKG_OVERRIDES_CSWemacs-common		+=	file-with-bad-content|/usr/local|root/opt/csw/share/emacs/23.4/etc/NEWS.19
-CHECKPKG_OVERRIDES_CSWemacs-common		+=	file-with-bad-content|/usr/local|root/opt/csw/share/emacs/23.4/etc/DOC-23.4.1
-CHECKPKG_OVERRIDES_CSWemacs-common		+=	file-with-bad-content|/usr/local|root/opt/csw/share/emacs/23.4/lisp/man.elc
-CHECKPKG_OVERRIDES_CSWemacs-common		+=	file-with-bad-content|/usr/local|root/opt/csw/share/emacs/23.4/lisp/paths.el
-CHECKPKG_OVERRIDES_CSWemacs-common		+=	file-with-bad-content|/usr/local|root/opt/csw/share/emacs/23.4/lisp/complete.elc
-CHECKPKG_OVERRIDES_CSWemacs-common		+=	file-with-bad-content|/usr/local|root/opt/csw/share/emacs/23.4/lisp/ffap.elc
-CHECKPKG_OVERRIDES_CSWemacs-common		+=	file-with-bad-content|/usr/local|root/opt/csw/share/emacs/23.4/lisp/ps-bdf.elc
-CHECKPKG_OVERRIDES_CSWemacs-common		+=	file-with-bad-content|/usr/local|root/opt/csw/share/emacs/23.4/lisp/find-file.elc
-CHECKPKG_OVERRIDES_CSWemacs-common		+=	file-with-bad-content|/usr/local|root/opt/csw/share/emacs/23.4/lisp/loaddefs.el
-CHECKPKG_OVERRIDES_CSWemacs-common		+=	file-with-bad-content|/usr/local|root/opt/csw/share/emacs/23.4/lisp/ldefs-boot.el
-CHECKPKG_OVERRIDES_CSWemacs-common		+=	file-with-bad-content|/usr/local|root/opt/csw/share/emacs/23.4/lisp/woman.elc
-CHECKPKG_OVERRIDES_CSWemacs-common		+=	file-with-bad-content|/usr/local|root/opt/csw/share/emacs/23.4/lisp/progmodes/idlwave.elc
-CHECKPKG_OVERRIDES_CSWemacs-common		+=	file-with-bad-content|/usr/local|root/opt/csw/share/emacs/23.4/lisp/progmodes/idlw-help.elc
-CHECKPKG_OVERRIDES_CSWemacs-common		+=	file-with-bad-content|/usr/local|root/opt/csw/share/emacs/23.4/lisp/progmodes/m4-mode.elc
-CHECKPKG_OVERRIDES_CSWemacs-common		+=	file-with-bad-content|/usr/local|root/opt/csw/share/emacs/23.4/lisp/progmodes/ada-mode.elc
-CHECKPKG_OVERRIDES_CSWemacs-common		+=	file-with-bad-content|/usr/local|root/opt/csw/share/emacs/23.4/lisp/play/dunnet.elc
-CHECKPKG_OVERRIDES_CSWemacs-common		+=	file-with-bad-content|/usr/local|root/opt/csw/share/emacs/23.4/lisp/textmodes/ispell.elc
-CHECKPKG_OVERRIDES_CSWemacs-common		+=	file-with-bad-content|/usr/local|root/opt/csw/share/emacs/23.4/lisp/mh-e/mh-e.elc
-CHECKPKG_OVERRIDES_CSWemacs-common		+=	file-with-bad-content|/usr/local|root/opt/csw/share/emacs/23.4/lisp/gnus/gnus-setup.elc
-CHECKPKG_OVERRIDES_CSWemacs-common		+=	file-with-bad-content|/usr/local|root/opt/csw/share/emacs/23.4/lisp/gnus/gnus-art.elc
-CHECKPKG_OVERRIDES_CSWemacs-common		+=	file-with-bad-content|/usr/local|root/opt/csw/share/emacs/23.4/lisp/gnus/mailcap.elc
-CHECKPKG_OVERRIDES_CSWemacs-common		+=	file-with-bad-content|/usr/local|root/opt/csw/share/emacs/23.4/lisp/net/tramp.elc
+CHECKPKG_OVERRIDES_CSWemacs-common		+=	file-with-bad-content|/usr/local|root/opt/csw/share/emacs/$(VERSION)/etc/MH-E-NEWS
+CHECKPKG_OVERRIDES_CSWemacs-common		+=	file-with-bad-content|/usr/local|root/opt/csw/share/emacs/$(VERSION)/etc/NEWS.20
+CHECKPKG_OVERRIDES_CSWemacs-common		+=	file-with-bad-content|/usr/local|root/opt/csw/share/emacs/$(VERSION)/etc/emacs.bash
+CHECKPKG_OVERRIDES_CSWemacs-common		+=	file-with-bad-content|/usr/local|root/opt/csw/share/emacs/$(VERSION)/etc/MACHINES
+CHECKPKG_OVERRIDES_CSWemacs-common		+=	file-with-bad-content|/usr/local|root/opt/csw/share/emacs/$(VERSION)/etc/PROBLEMS
+CHECKPKG_OVERRIDES_CSWemacs-common		+=	file-with-bad-content|/usr/local|root/opt/csw/share/emacs/$(VERSION)/etc/NEWS.19
+CHECKPKG_OVERRIDES_CSWemacs-common		+=	file-with-bad-content|/usr/local|root/opt/csw/share/emacs/$(VERSION)/etc/DOC-$(VERSION).1
+CHECKPKG_OVERRIDES_CSWemacs-common		+=	file-with-bad-content|/usr/local|root/opt/csw/share/emacs/$(VERSION)/lisp/man.elc
+CHECKPKG_OVERRIDES_CSWemacs-common		+=	file-with-bad-content|/usr/local|root/opt/csw/share/emacs/$(VERSION)/lisp/paths.el
+CHECKPKG_OVERRIDES_CSWemacs-common		+=	file-with-bad-content|/usr/local|root/opt/csw/share/emacs/$(VERSION)/lisp/complete.elc
+CHECKPKG_OVERRIDES_CSWemacs-common		+=	file-with-bad-content|/usr/local|root/opt/csw/share/emacs/$(VERSION)/lisp/ffap.elc
+CHECKPKG_OVERRIDES_CSWemacs-common		+=	file-with-bad-content|/usr/local|root/opt/csw/share/emacs/$(VERSION)/lisp/ps-bdf.elc
+CHECKPKG_OVERRIDES_CSWemacs-common		+=	file-with-bad-content|/usr/local|root/opt/csw/share/emacs/$(VERSION)/lisp/find-file.elc
+CHECKPKG_OVERRIDES_CSWemacs-common		+=	file-with-bad-content|/usr/local|root/opt/csw/share/emacs/$(VERSION)/lisp/loaddefs.el
+CHECKPKG_OVERRIDES_CSWemacs-common		+=	file-with-bad-content|/usr/local|root/opt/csw/share/emacs/$(VERSION)/lisp/ldefs-boot.el
+CHECKPKG_OVERRIDES_CSWemacs-common		+=	file-with-bad-content|/usr/local|root/opt/csw/share/emacs/$(VERSION)/lisp/woman.elc
+CHECKPKG_OVERRIDES_CSWemacs-common		+=	file-with-bad-content|/usr/local|root/opt/csw/share/emacs/$(VERSION)/lisp/progmodes/idlwave.elc
+CHECKPKG_OVERRIDES_CSWemacs-common		+=	file-with-bad-content|/usr/local|root/opt/csw/share/emacs/$(VERSION)/lisp/progmodes/idlw-help.elc
+CHECKPKG_OVERRIDES_CSWemacs-common		+=	file-with-bad-content|/usr/local|root/opt/csw/share/emacs/$(VERSION)/lisp/progmodes/m4-mode.elc
+CHECKPKG_OVERRIDES_CSWemacs-common		+=	file-with-bad-content|/usr/local|root/opt/csw/share/emacs/$(VERSION)/lisp/progmodes/ada-mode.elc
+CHECKPKG_OVERRIDES_CSWemacs-common		+=	file-with-bad-content|/usr/local|root/opt/csw/share/emacs/$(VERSION)/lisp/play/dunnet.elc
+CHECKPKG_OVERRIDES_CSWemacs-common		+=	file-with-bad-content|/usr/local|root/opt/csw/share/emacs/$(VERSION)/lisp/textmodes/ispell.elc
+CHECKPKG_OVERRIDES_CSWemacs-common		+=	file-with-bad-content|/usr/local|root/opt/csw/share/emacs/$(VERSION)/lisp/mh-e/mh-e.elc
+CHECKPKG_OVERRIDES_CSWemacs-common		+=	file-with-bad-content|/usr/local|root/opt/csw/share/emacs/$(VERSION)/lisp/gnus/gnus-setup.elc
+CHECKPKG_OVERRIDES_CSWemacs-common		+=	file-with-bad-content|/usr/local|root/opt/csw/share/emacs/$(VERSION)/lisp/gnus/gnus-art.elc
+CHECKPKG_OVERRIDES_CSWemacs-common		+=	file-with-bad-content|/usr/local|root/opt/csw/share/emacs/$(VERSION)/lisp/gnus/mailcap.elc
+CHECKPKG_OVERRIDES_CSWemacs-common		+=	file-with-bad-content|/usr/local|root/opt/csw/share/emacs/$(VERSION)/lisp/net/tramp.elc
 CHECKPKG_OVERRIDES_CSWemacs-common		+=	file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/emacs.1
 PKGFILES_CSWemacs-bin-common			=	/opt/csw/bin/b2m
 PKGFILES_CSWemacs-bin-common			+=	/opt/csw/bin/ctags
@@ -259,8 +260,8 @@
 RUNTIME_DEP_PKGS_CSWemacs	+=	CSWlibz1
 RUNTIME_DEP_PKGS_CSWemacs	+=	CSWpango
 RUNTIME_DEP_PKGS_CSWemacs	+=	CSWxpm
-CHECKPKG_OVERRIDES_CSWemacs	+=	file-with-bad-content|/usr/local|root/opt/csw/bin/emacs-23.4-athena
-CHECKPKG_OVERRIDES_CSWemacs	+=	file-with-bad-content|/usr/share|root/opt/csw/bin/emacs-23.4-athena
+CHECKPKG_OVERRIDES_CSWemacs	+=	file-with-bad-content|/usr/local|root/opt/csw/bin/emacs-$(VERSION)-athena
+CHECKPKG_OVERRIDES_CSWemacs	+=	file-with-bad-content|/usr/share|root/opt/csw/bin/emacs-$(VERSION)-athena
 CHECKPKG_OVERRIDES_CSWemacs	+=	missing-dependency|CSWlibm17n-utils
 CHECKPKG_OVERRIDES_CSWemacs	+=	missing-dependency|CSWlibotf-utils
 CHECKPKG_OVERRIDES_CSWemacs	+=	missing-dependency|CSWlibfontconfig1
@@ -330,6 +331,8 @@
 RUNTIME_DEP_PKGS_CSWemacs-gtk	+=	CSWorbit2
 RUNTIME_DEP_PKGS_CSWemacs-gtk	+=	CSWpango
 RUNTIME_DEP_PKGS_CSWemacs-gtk	+=	CSWxpm
+CHECKPKG_OVERRIDES_CSWemacs-gtk	+=	file-with-bad-content|/usr/local|root/opt/csw/bin/emacs-$(VERSION)-gtk
+CHECKPKG_OVERRIDES_CSWemacs-gtk	+=	file-with-bad-content|/usr/share|root/opt/csw/bin/emacs-$(VERSION)-gtk
 CHECKPKG_OVERRIDES_CSWemacs-gtk	+=	surplus-dependency|CSWlibcroco
 CHECKPKG_OVERRIDES_CSWemacs-gtk	+=	surplus-dependency|CSWemacs-common
 CHECKPKG_OVERRIDES_CSWemacs-gtk	+=	surplus-dependency|CSWlibiconv2

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



More information about the devel mailing list