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

pfelecan at users.sourceforge.net pfelecan at users.sourceforge.net
Fri Jun 1 15:46:28 CEST 2012


Revision: 18194
          http://gar.svn.sourceforge.net/gar/?rev=18194&view=rev
Author:   pfelecan
Date:     2012-06-01 13:46:28 +0000 (Fri, 01 Jun 2012)
Log Message:
-----------
emacs is now a meta-package used for dependencies on emacs; the old
content is now in a specific emacs_athena package which is a
dependency of the former.

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

Modified: csw/mgar/pkg/emacs/trunk/Makefile
===================================================================
--- csw/mgar/pkg/emacs/trunk/Makefile	2012-06-01 11:42:45 UTC (rev 18193)
+++ csw/mgar/pkg/emacs/trunk/Makefile	2012-06-01 13:46:28 UTC (rev 18194)
@@ -103,7 +103,7 @@
 MERGE_DIRS_isa-default-features-nox			=	$(bindir)
 MERGE_SCRIPTS_isa-default-features-nox		=	copy-only
 
-ALTERNATIVES_CSWemacs		=	athena
+ALTERNATIVES_CSWemacs-athena=	athena
 ALTERNATIVES_CSWemacs-gtk	=	gtk
 ALTERNATIVES_CSWemacs-nox	=	nox
 
@@ -227,71 +227,77 @@
 PKGFILES_CSWemacs-bin-common			+=	/opt/csw/libexec/emacs/$(VERSION)/[^/]*solaris[^/]*/sorted-doc
 PKGFILES_CSWemacs-bin-common			+=	/opt/csw/libexec/emacs/$(VERSION)/[^/]*solaris[^/]*/update-game-score
 
-PACKAGES					+=	CSWemacs
-SPKG_DESC_CSWemacs			=	$(DESCRIPTION) - based on the Athena toolkit
+PACKAGES					=	CSWemacs
+SPKG_DESC_CSWemacs			=	$(DESCRIPTION) - metapackage for generic dependencies
 CATALOGNAME_CSWemacs		=	emacs
-RUNTIME_DEP_PKGS_CSWemacs	=	CSWemacs-common
-RUNTIME_DEP_PKGS_CSWemacs	+=	CSWemacs-bin-common
-RUNTIME_DEP_PKGS_CSWemacs	+=	CSWfconfig
-RUNTIME_DEP_PKGS_CSWemacs	+=	CSWlibbz2-1-0
-RUNTIME_DEP_PKGS_CSWemacs	+=	CSWlibcairo2
-RUNTIME_DEP_PKGS_CSWemacs	+=	CSWlibcroco
-RUNTIME_DEP_PKGS_CSWemacs	+=	CSWlibdatrie1
-RUNTIME_DEP_PKGS_CSWemacs	+=	CSWlibexpat1
-RUNTIME_DEP_PKGS_CSWemacs	+=	CSWlibfontconfig1
-RUNTIME_DEP_PKGS_CSWemacs	+=	CSWlibfreetype6
-RUNTIME_DEP_PKGS_CSWemacs	+=	CSWlibgcc-s1
-RUNTIME_DEP_PKGS_CSWemacs	+=	CSWlibgdk-pixbuf2-0-0
-RUNTIME_DEP_PKGS_CSWemacs	+=	CSWlibgif4
-RUNTIME_DEP_PKGS_CSWemacs	+=	CSWlibgio2-0-0
-RUNTIME_DEP_PKGS_CSWemacs	+=	CSWlibglib2-0-0
-RUNTIME_DEP_PKGS_CSWemacs	+=	CSWlibgmodule2-0-0
-RUNTIME_DEP_PKGS_CSWemacs	+=	CSWlibgobject2-0-0
-RUNTIME_DEP_PKGS_CSWemacs	+=	CSWlibgthread2-0-0
-RUNTIME_DEP_PKGS_CSWemacs	+=	CSWlibiconv2
-RUNTIME_DEP_PKGS_CSWemacs	+=	CSWlibintl8
-RUNTIME_DEP_PKGS_CSWemacs	+=	CSWlibjbig2
-RUNTIME_DEP_PKGS_CSWemacs	+=	CSWlibjpeg7
-RUNTIME_DEP_PKGS_CSWemacs	+=	CSWlibm17n0
-RUNTIME_DEP_PKGS_CSWemacs	+=	CSWlibm17n-utils
-RUNTIME_DEP_PKGS_CSWemacs	+=	CSWlibotf0
-RUNTIME_DEP_PKGS_CSWemacs	+=	CSWlibotf-utils
-RUNTIME_DEP_PKGS_CSWemacs	+=	CSWlibpixman1-0
-RUNTIME_DEP_PKGS_CSWemacs	+=	CSWlibpng12-0
-RUNTIME_DEP_PKGS_CSWemacs	+=	CSWlibrsvg2-2
-RUNTIME_DEP_PKGS_CSWemacs	+=	CSWlibthai0
-RUNTIME_DEP_PKGS_CSWemacs	+=	CSWlibtiff3
-RUNTIME_DEP_PKGS_CSWemacs	+=	CSWlibxft2
-RUNTIME_DEP_PKGS_CSWemacs	+=	CSWlibxml2-2
-RUNTIME_DEP_PKGS_CSWemacs	+=	CSWlibxrender
-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-athena
-CHECKPKG_OVERRIDES_CSWemacs	+=	file-with-bad-content|/usr/share|root/opt/csw/bin/emacs-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
-CHECKPKG_OVERRIDES_CSWemacs	+=	surplus-dependency|CSWlibcroco
-CHECKPKG_OVERRIDES_CSWemacs	+=	surplus-dependency|CSWemacs-common
-CHECKPKG_OVERRIDES_CSWemacs	+=	surplus-dependency|CSWlibiconv2
-CHECKPKG_OVERRIDES_CSWemacs	+=	surplus-dependency|CSWlibotf0
-CHECKPKG_OVERRIDES_CSWemacs	+=	surplus-dependency|CSWlibdatrie1
-CHECKPKG_OVERRIDES_CSWemacs	+=	surplus-dependency|CSWlibthai0
-CHECKPKG_OVERRIDES_CSWemacs	+=	surplus-dependency|CSWlibgcc-s1
-CHECKPKG_OVERRIDES_CSWemacs	+=	surplus-dependency|CSWlibm17n0
-CHECKPKG_OVERRIDES_CSWemacs	+=	surplus-dependency|CSWlibjbig2
-CHECKPKG_OVERRIDES_CSWemacs	+=	surplus-dependency|CSWpango
-CHECKPKG_OVERRIDES_CSWemacs	+=	surplus-dependency|CSWemacs-bin-common
-CHECKPKG_OVERRIDES_CSWemacs	+=	surplus-dependency|CSWlibxml2-2
-CHECKPKG_OVERRIDES_CSWemacs	+=	surplus-dependency|CSWlibexpat1
-CHECKPKG_OVERRIDES_CSWemacs	+=	surplus-dependency|CSWlibpixman1-0
-CHECKPKG_OVERRIDES_CSWemacs	+=	surplus-dependency|CSWfconfig
-PKGFILES_CSWemacs			=	/opt/csw/bin/emacs-athena
-PKGFILES_CSWemacs			+=	/opt/csw/bin/emacs-$(VERSION)-athena
+PKGFILES_CSWemacs			=	NOFILES
+RUNTIME_DEP_PKGS_CSWemacs	=	CSWemacs-athena
 
+PACKAGES							+=	CSWemacs-athena
+SPKG_DESC_CSWemacs-athena			=	$(DESCRIPTION) - based on the Athena toolkit
+CATALOGNAME_CSWemacs-athena			=	emacs_athena
+RUNTIME_DEP_PKGS_CSWemacs-athena	=	CSWemacs-common
+RUNTIME_DEP_PKGS_CSWemacs-athena	+=	CSWemacs-bin-common
+RUNTIME_DEP_PKGS_CSWemacs-athena	+=	CSWfconfig
+RUNTIME_DEP_PKGS_CSWemacs-athena	+=	CSWlibbz2-1-0
+RUNTIME_DEP_PKGS_CSWemacs-athena	+=	CSWlibcairo2
+RUNTIME_DEP_PKGS_CSWemacs-athena	+=	CSWlibcroco
+RUNTIME_DEP_PKGS_CSWemacs-athena	+=	CSWlibdatrie1
+RUNTIME_DEP_PKGS_CSWemacs-athena	+=	CSWlibexpat1
+RUNTIME_DEP_PKGS_CSWemacs-athena	+=	CSWlibfontconfig1
+RUNTIME_DEP_PKGS_CSWemacs-athena	+=	CSWlibfreetype6
+RUNTIME_DEP_PKGS_CSWemacs-athena	+=	CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWemacs-athena	+=	CSWlibgdk-pixbuf2-0-0
+RUNTIME_DEP_PKGS_CSWemacs-athena	+=	CSWlibgif4
+RUNTIME_DEP_PKGS_CSWemacs-athena	+=	CSWlibgio2-0-0
+RUNTIME_DEP_PKGS_CSWemacs-athena	+=	CSWlibglib2-0-0
+RUNTIME_DEP_PKGS_CSWemacs-athena	+=	CSWlibgmodule2-0-0
+RUNTIME_DEP_PKGS_CSWemacs-athena	+=	CSWlibgobject2-0-0
+RUNTIME_DEP_PKGS_CSWemacs-athena	+=	CSWlibgthread2-0-0
+RUNTIME_DEP_PKGS_CSWemacs-athena	+=	CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWemacs-athena	+=	CSWlibintl8
+RUNTIME_DEP_PKGS_CSWemacs-athena	+=	CSWlibjbig2
+RUNTIME_DEP_PKGS_CSWemacs-athena	+=	CSWlibjpeg7
+RUNTIME_DEP_PKGS_CSWemacs-athena	+=	CSWlibm17n0
+RUNTIME_DEP_PKGS_CSWemacs-athena	+=	CSWlibm17n-utils
+RUNTIME_DEP_PKGS_CSWemacs-athena	+=	CSWlibotf0
+RUNTIME_DEP_PKGS_CSWemacs-athena	+=	CSWlibotf-utils
+RUNTIME_DEP_PKGS_CSWemacs-athena	+=	CSWlibpixman1-0
+RUNTIME_DEP_PKGS_CSWemacs-athena	+=	CSWlibpng12-0
+RUNTIME_DEP_PKGS_CSWemacs-athena	+=	CSWlibrsvg2-2
+RUNTIME_DEP_PKGS_CSWemacs-athena	+=	CSWlibthai0
+RUNTIME_DEP_PKGS_CSWemacs-athena	+=	CSWlibtiff3
+RUNTIME_DEP_PKGS_CSWemacs-athena	+=	CSWlibxft2
+RUNTIME_DEP_PKGS_CSWemacs-athena	+=	CSWlibxml2-2
+RUNTIME_DEP_PKGS_CSWemacs-athena	+=	CSWlibxrender
+RUNTIME_DEP_PKGS_CSWemacs-athena	+=	CSWlibz1
+RUNTIME_DEP_PKGS_CSWemacs-athena	+=	CSWpango
+RUNTIME_DEP_PKGS_CSWemacs-athena	+=	CSWxpm
+CHECKPKG_OVERRIDES_CSWemacs-athena	+=	file-with-bad-content|/usr/local|root/opt/csw/bin/emacs-athena
+CHECKPKG_OVERRIDES_CSWemacs-athena	+=	file-with-bad-content|/usr/share|root/opt/csw/bin/emacs-athena
+CHECKPKG_OVERRIDES_CSWemacs-athena	+=	file-with-bad-content|/usr/local|root/opt/csw/bin/emacs-$(VERSION)-athena
+CHECKPKG_OVERRIDES_CSWemacs-athena	+=	file-with-bad-content|/usr/share|root/opt/csw/bin/emacs-$(VERSION)-athena
+CHECKPKG_OVERRIDES_CSWemacs-athena	+=	missing-dependency|CSWlibm17n-utils
+CHECKPKG_OVERRIDES_CSWemacs-athena	+=	missing-dependency|CSWlibotf-utils
+CHECKPKG_OVERRIDES_CSWemacs-athena	+=	missing-dependency|CSWlibfontconfig1
+CHECKPKG_OVERRIDES_CSWemacs-athena	+=	surplus-dependency|CSWlibcroco
+CHECKPKG_OVERRIDES_CSWemacs-athena	+=	surplus-dependency|CSWemacs-athena-common
+CHECKPKG_OVERRIDES_CSWemacs-athena	+=	surplus-dependency|CSWlibiconv2
+CHECKPKG_OVERRIDES_CSWemacs-athena	+=	surplus-dependency|CSWlibotf0
+CHECKPKG_OVERRIDES_CSWemacs-athena	+=	surplus-dependency|CSWlibdatrie1
+CHECKPKG_OVERRIDES_CSWemacs-athena	+=	surplus-dependency|CSWlibthai0
+CHECKPKG_OVERRIDES_CSWemacs-athena	+=	surplus-dependency|CSWlibgcc-s1
+CHECKPKG_OVERRIDES_CSWemacs-athena	+=	surplus-dependency|CSWlibm17n0
+CHECKPKG_OVERRIDES_CSWemacs-athena	+=	surplus-dependency|CSWlibjbig2
+CHECKPKG_OVERRIDES_CSWemacs-athena	+=	surplus-dependency|CSWpango
+CHECKPKG_OVERRIDES_CSWemacs-athena	+=	surplus-dependency|CSWemacs-athena-bin-common
+CHECKPKG_OVERRIDES_CSWemacs-athena	+=	surplus-dependency|CSWlibxml2-2
+CHECKPKG_OVERRIDES_CSWemacs-athena	+=	surplus-dependency|CSWlibexpat1
+CHECKPKG_OVERRIDES_CSWemacs-athena	+=	surplus-dependency|CSWlibpixman1-0
+CHECKPKG_OVERRIDES_CSWemacs-athena	+=	surplus-dependency|CSWfconfig
+PKGFILES_CSWemacs-athena			=	/opt/csw/bin/emacs-athena
+PKGFILES_CSWemacs-athena			+=	/opt/csw/bin/emacs-$(VERSION)-athena
+
 PACKAGES						+=	CSWemacs-gtk
 SPKG_DESC_CSWemacs-gtk			=	$(DESCRIPTION) - based on the GTK toolkit
 CATALOGNAME_CSWemacs-gtk		=	emacs_gtk

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