[csw-devel] SF.net SVN: gar:[18103] csw/mgar/pkg/emacs/trunk/Makefile
pfelecan at users.sourceforge.net
pfelecan at users.sourceforge.net
Thu May 24 11:58:31 CEST 2012
Revision: 18103
http://gar.svn.sourceforge.net/gar/?rev=18103&view=rev
Author: pfelecan
Date: 2012-05-24 09:58:31 +0000 (Thu, 24 May 2012)
Log Message:
-----------
- added dependencies where needed
- stubbed old catalog names to use the new and readable catalog names
Modified Paths:
--------------
csw/mgar/pkg/emacs/trunk/Makefile
Modified: csw/mgar/pkg/emacs/trunk/Makefile
===================================================================
--- csw/mgar/pkg/emacs/trunk/Makefile 2012-05-24 09:28:03 UTC (rev 18102)
+++ csw/mgar/pkg/emacs/trunk/Makefile 2012-05-24 09:58:31 UTC (rev 18103)
@@ -23,7 +23,7 @@
GARCOMPILER = GNU
BUILD_DEP_PKGS = CSWcoreutils
-BUILD_DEP_PKGS += CSWglib2devel \
+BUILD_DEP_PKGS += CSWglib2devel
BUILD_DEP_PKGS += CSWlibatk-dev
BUILD_DEP_PKGS += CSWlibbz2-dev
BUILD_DEP_PKGS += CSWlibcairo-dev
@@ -104,70 +104,152 @@
MERGE_SCRIPTS_isa-default-features-nox = copy-only
ALTERNATIVES_CSWemacs = athena
-ALTERNATIVES_CSWemacsgtk = gtk
-ALTERNATIVES_CSWemacsnox = nox
+ALTERNATIVES_CSWemacs-gtk = gtk
+ALTERNATIVES_CSWemacs-nox = nox
ALTERNATIVE_athena = $(bindir)/emacs emacs $(bindir)/emacs-athena 200
ALTERNATIVE_gtk = $(bindir)/emacs emacs $(bindir)/emacs-gtk 100
ALTERNATIVE_nox = $(bindir)/emacs emacs $(bindir)/emacs-nox 300
-PACKAGES = CSWemacscommon
-SPKG_DESC_CSWemacscommon = $(DESCRIPTION) - architecture neutral common components
-CATALOGNAME_CSWemacscommon = emacs_common
+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_CSWemacscommon = CSWemacschooser
-ARCHALL_CSWemacscommon = 1
+OBSOLETED_BY_CSWemacs-common = CSWemacschooser
+OBSOLETED_BY_CSWemacs-common += CSWemacscommon
+CATALOGNAME_CSWemacscommon = emacscommon_stub
+ARCHALL_CSWemacs-common = 1
-PACKAGES += CSWemacsel
-SPKG_DESC_CSWemacsel = $(DESCRIPTION) - elisp sources
-CATALOGNAME_CSWemacsel = emacs_el
-RUNTIME_DEP_PKGS_CSWemacsel = CSWemacscommon
-PKGFILES_CSWemacsel = /opt/csw/share/emacs/$(VERSION)/.*[.]el[.]gz
-ARCHALL_CSWemacsel = 1
+PACKAGES += CSWemacs-el
+SPKG_DESC_CSWemacs-el = $(DESCRIPTION) - elisp sources
+CATALOGNAME_CSWemacs-el = emacs_el
+OBSOLETED_BY_CSWemacs-el = CSWemacsel
+CATALOGNAME_CSWemacsel = emacsel_stub
+RUNTIME_DEP_PKGS_CSWemacs-el= CSWemacs-common
+PKGFILES_CSWemacs-el = /opt/csw/share/emacs/$(VERSION)/.*[.]el[.]gz
+ARCHALL_CSWemacs-el = 1
-PACKAGES += CSWemacsbincommon
-SPKG_DESC_CSWemacsbincommon = $(DESCRIPTION) - common binaries
-CATALOGNAME_CSWemacsbincommon = emacs_bin_common
-RUNTIME_DEP_PKGS_CSWemacsbincommon = CSWemacscommon
-PKGFILES_CSWemacsbincommon = /opt/csw/bin/b2m
-PKGFILES_CSWemacsbincommon += /opt/csw/bin/ctags
-PKGFILES_CSWemacsbincommon += /opt/csw/bin/ebrowse
-PKGFILES_CSWemacsbincommon += /opt/csw/bin/emacsclient
-PKGFILES_CSWemacsbincommon += /opt/csw/bin/etags
-PKGFILES_CSWemacsbincommon += /opt/csw/libexec/emacs/$(VERSION)/[^/]*solaris[^/]*/digest-doc
-PKGFILES_CSWemacsbincommon += /opt/csw/libexec/emacs/$(VERSION)/[^/]*solaris[^/]*/fakemail
-PKGFILES_CSWemacsbincommon += /opt/csw/libexec/emacs/$(VERSION)/[^/]*solaris[^/]*/hexl
-PKGFILES_CSWemacsbincommon += /opt/csw/libexec/emacs/$(VERSION)/[^/]*solaris[^/]*/movemail
-PKGFILES_CSWemacsbincommon += /opt/csw/libexec/emacs/$(VERSION)/[^/]*solaris[^/]*/profile
-PKGFILES_CSWemacsbincommon += /opt/csw/libexec/emacs/$(VERSION)/[^/]*solaris[^/]*/sorted-doc
-PKGFILES_CSWemacsbincommon += /opt/csw/libexec/emacs/$(VERSION)/[^/]*solaris[^/]*/update-game-score
+PACKAGES += CSWemacs-bin-common
+SPKG_DESC_CSWemacs-bin-common = $(DESCRIPTION) - common binaries
+CATALOGNAME_CSWemacs-bin-common = emacs_bin_common
+OBSOLETED_BY_CSWemacs-bin-common = CSWemacsbincommon
+CATALOGNAME_CSWemacsbincommon = emacsbincommon_stub
+RUNTIME_DEP_PKGS_CSWemacs-bin-common = CSWemacs-common
+PKGFILES_CSWemacs-bin-common = /opt/csw/bin/b2m
+PKGFILES_CSWemacs-bin-common += /opt/csw/bin/ctags
+PKGFILES_CSWemacs-bin-common += /opt/csw/bin/ebrowse
+PKGFILES_CSWemacs-bin-common += /opt/csw/bin/emacsclient
+PKGFILES_CSWemacs-bin-common += /opt/csw/bin/etags
+PKGFILES_CSWemacs-bin-common += /opt/csw/libexec/emacs/$(VERSION)/[^/]*solaris[^/]*/digest-doc
+PKGFILES_CSWemacs-bin-common += /opt/csw/libexec/emacs/$(VERSION)/[^/]*solaris[^/]*/fakemail
+PKGFILES_CSWemacs-bin-common += /opt/csw/libexec/emacs/$(VERSION)/[^/]*solaris[^/]*/hexl
+PKGFILES_CSWemacs-bin-common += /opt/csw/libexec/emacs/$(VERSION)/[^/]*solaris[^/]*/movemail
+PKGFILES_CSWemacs-bin-common += /opt/csw/libexec/emacs/$(VERSION)/[^/]*solaris[^/]*/profile
+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
CATALOGNAME_CSWemacs = emacs
-RUNTIME_DEP_PKGS_CSWemacs = CSWemacscommon
-RUNTIME_DEP_PKGS_CSWemacs += CSWemacsbincommon
-
+RUNTIME_DEP_PKGS_CSWemacs = CSWemacs-common
+RUNTIME_DEP_PKGS_CSWemacs += CSWemac-sbin-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 += CSWlibdbus1-3
+RUNTIME_DEP_PKGS_CSWemacs += CSWlibexpat1
+RUNTIME_DEP_PKGS_CSWemacs += CSWlibfreetype6
+RUNTIME_DEP_PKGS_CSWemacs += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWemacs += CSWlibgconf2-4
+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 += CSWlibotf0
+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 += CSWorbit2
+RUNTIME_DEP_PKGS_CSWemacs += CSWpango
+RUNTIME_DEP_PKGS_CSWemacs += CSWxpm
PKGFILES_CSWemacs = /opt/csw/bin/emacs-athena
PKGFILES_CSWemacs += /opt/csw/bin/emacs-$(VERSION)-athena
-PACKAGES += CSWemacsgtk
-SPKG_DESC_CSWemacsgtk = $(DESCRIPTION) - based on the GTK toolkit
-CATALOGNAME_CSWemacsgtk = emacs_gtk
-RUNTIME_DEP_PKGS_CSWemacsgtk= CSWemacscommon
-RUNTIME_DEP_PKGS_CSWemacsgtk+= CSWemacsbincommon
-PKGFILES_CSWemacsgtk = /opt/csw/bin/emacs-gtk
-PKGFILES_CSWemacsgtk += /opt/csw/bin/emacs-$(VERSION)-gtk
+PACKAGES += CSWemacs-gtk
+SPKG_DESC_CSWemacs-gtk = $(DESCRIPTION) - based on the GTK toolkit
+CATALOGNAME_CSWemacs-gtk = emacs_gtk
+OBSOLETED_BY_CSWemacs-gtk = CSWemacsgtk
+CATALOGNAME_CSWemacsgtk = emacs_gtk_stub
+RUNTIME_DEP_PKGS_CSWemacs-gtk = CSWemacs-common
+RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWemacs-bin-common
+RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWfconfig
+RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibatk1-0-0
+RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibbz2-1-0
+RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibcairo2
+RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibcroco
+RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibdatrie1
+RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibdbus1-3
+RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibexpat1
+RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibfreetype6
+RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibgconf2-4
+RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibgdk-pixbuf2-0-0
+RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibgdk-x11-2-0-0
+RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibgif4
+RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibgio2-0-0
+RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibglib2-0-0
+RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibgmodule2-0-0
+RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibgobject2-0-0
+RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibgthread2-0-0
+RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibgtk-x11-2-0-0
+RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibjbig2
+RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibjpeg7
+RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibm17n0
+RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibotf0
+RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibpixman1-0
+RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibpng12-0
+RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibrsvg2-2
+RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibthai0
+RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibtiff3
+RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibxft2
+RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibxml2-2
+RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibxrender
+RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibz1
+RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWorbit2
+RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWpango
+RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWxpm
+PKGFILES_CSWemacs-gtk = /opt/csw/bin/emacs-gtk
+PKGFILES_CSWemacs-gtk += /opt/csw/bin/emacs-$(VERSION)-gtk
-PACKAGES += CSWemacsnox
-SPKG_DESC_CSWemacsnox = $(DESCRIPTION) - without any XWindows dependencies
-CATALOGNAME_CSWemacsnox = emacs_nox
-RUNTIME_DEP_PKGS_CSWemacsnox= CSWemacscommon
-RUNTIME_DEP_PKGS_CSWemacsnox+= CSWemacsbincommon
-PKGFILES_CSWemacsnox = /opt/csw/bin/emacs-nox
-PKGFILES_CSWemacsnox += /opt/csw/bin/emacs-$(VERSION)-nox
+PACKAGES += CSWemacs-nox
+SPKG_DESC_CSWemacs-nox = $(DESCRIPTION) - without any XWindows dependencies
+CATALOGNAME_CSWemacsnox = emacs_nox
+OBSOLETED_BY_CSWemacs-nox = CSWemacsnox
+CATALOGNAME_CSWemacsnox = emacs_nox_stub
+RUNTIME_DEP_PKGS_CSWemacs-nox = CSWemacs-common
+RUNTIME_DEP_PKGS_CSWemacs-nox += CSWemacs-bin-common
+PKGFILES_CSWemacs-nox = /opt/csw/bin/emacs-nox
+PKGFILES_CSWemacs-nox += /opt/csw/bin/emacs-$(VERSION)-nox
include gar/category.mk
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