[csw-devel] SF.net SVN: gar:[19406] csw/mgar/pkg/emacs/trunk/Makefile
pfelecan at users.sourceforge.net
pfelecan at users.sourceforge.net
Wed Oct 10 09:32:51 CEST 2012
Revision: 19406
http://gar.svn.sourceforge.net/gar/?rev=19406&view=rev
Author: pfelecan
Date: 2012-10-10 07:32:51 +0000 (Wed, 10 Oct 2012)
Log Message:
-----------
emacs/trunk:
- do not generate compressed manual pages and info files
- new build dependencies
- new run-time dependencies
- adapted overrides as much as possible
Modified Paths:
--------------
csw/mgar/pkg/emacs/trunk/Makefile
Modified: csw/mgar/pkg/emacs/trunk/Makefile
===================================================================
--- csw/mgar/pkg/emacs/trunk/Makefile 2012-10-10 04:38:06 UTC (rev 19405)
+++ csw/mgar/pkg/emacs/trunk/Makefile 2012-10-10 07:32:51 UTC (rev 19406)
@@ -26,6 +26,7 @@
BUILD_DEP_PKGS = CSWcoreutils
BUILD_DEP_PKGS += CSWfconfig-dev
BUILD_DEP_PKGS += CSWglib2devel
+BUILD_DEP_PKGS += CSWimagemagick-dev
BUILD_DEP_PKGS += CSWlibatk-dev
BUILD_DEP_PKGS += CSWlibbz2-dev
BUILD_DEP_PKGS += CSWlibcairo-dev
@@ -38,11 +39,13 @@
BUILD_DEP_PKGS += CSWlibgdk-pixbuf-dev
BUILD_DEP_PKGS += CSWlibgif-dev
BUILD_DEP_PKGS += CSWlibglib2-dev
+BUILD_DEP_PKGS += CSWlibgnutls-dev
BUILD_DEP_PKGS += CSWlibgtk2-dev
BUILD_DEP_PKGS += CSWlibiconv-dev
BUILD_DEP_PKGS += CSWlibjbig-dev
BUILD_DEP_PKGS += CSWlibjpeg-dev
BUILD_DEP_PKGS += CSWlibm17n-dev
+BUILD_DEP_PKGS += CSWlibncurses-dev
BUILD_DEP_PKGS += CSWlibotf-dev
BUILD_DEP_PKGS += CSWlibpixman-dev
BUILD_DEP_PKGS += CSWlibpng-dev
@@ -56,6 +59,7 @@
BUILD_DEP_PKGS += CSWlibxdmcpdevel
BUILD_DEP_PKGS += CSWlibxft2devel
BUILD_DEP_PKGS += CSWlibxml2-dev
+BUILD_DEP_PKGS += CSWlibxpm-dev
BUILD_DEP_PKGS += CSWlibxpmdevel
BUILD_DEP_PKGS += CSWlibz-dev
BUILD_DEP_PKGS += CSWpangodevel
@@ -101,6 +105,7 @@
EXTRA_CONFIGURE_ARGS_nox += --without-x
CONFIGURE_ARGS = $(DIRPATHS)
+CONFIGURE_ARGS += --without-compress-info
CONFIGURE_ARGS += $(EXTRA_CONFIGURE_ARGS_$(FEATURES))
MERGE_SCRIPTS_isa-default-features-athena = copy-all
@@ -170,13 +175,13 @@
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/obsolete/complete.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
@@ -188,6 +193,8 @@
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/emacs/$(VERSION)/lisp/net/tramp-loaddefs.el
+CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/emacs/$(VERSION)/lisp/net/tramp-sh.elc
CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/emacs.1
# as we use alternatives, we need to obsolete emacs_chooser;
# emacs_common, being the root dependence of all emacs related
@@ -237,8 +244,8 @@
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 = CSWemacs-bin-common
+RUNTIME_DEP_PKGS_CSWemacs-athena += CSWemacs-common
RUNTIME_DEP_PKGS_CSWemacs-athena += CSWfconfig
RUNTIME_DEP_PKGS_CSWemacs-athena += CSWlibbz2-1-0
RUNTIME_DEP_PKGS_CSWemacs-athena += CSWlibcairo2
@@ -253,16 +260,20 @@
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 += CSWlibgnutls26
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 += CSWlibm17n-utils
RUNTIME_DEP_PKGS_CSWemacs-athena += CSWlibm17n0
-RUNTIME_DEP_PKGS_CSWemacs-athena += CSWlibm17n-utils
+RUNTIME_DEP_PKGS_CSWemacs-athena += CSWlibmagickcore5
+RUNTIME_DEP_PKGS_CSWemacs-athena += CSWlibmagickwand5
+RUNTIME_DEP_PKGS_CSWemacs-athena += CSWlibncurses5
+RUNTIME_DEP_PKGS_CSWemacs-athena += CSWlibotf-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
@@ -270,10 +281,10 @@
RUNTIME_DEP_PKGS_CSWemacs-athena += CSWlibtiff3
RUNTIME_DEP_PKGS_CSWemacs-athena += CSWlibxft2
RUNTIME_DEP_PKGS_CSWemacs-athena += CSWlibxml2-2
+RUNTIME_DEP_PKGS_CSWemacs-athena += CSWlibxpm4
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
@@ -304,8 +315,8 @@
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 = CSWemacs-bin-common
+RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWemacs-common
RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWfconfig
RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibatk1-0-0
RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibbz2-1-0
@@ -314,8 +325,8 @@
RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibdatrie1
RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibdbus1-3
RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibexpat1
+RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibfontconfig1
RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibfreetype6
-RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibfontconfig1
RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibgcc-s1
RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibgconf2-4
RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibgdk-pixbuf2-0-0
@@ -324,6 +335,7 @@
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 += CSWlibgnutls26
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
@@ -331,10 +343,13 @@
RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibintl8
RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibjbig2
RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibjpeg7
+RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibm17n-utils
RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibm17n0
-RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibm17n-utils
+RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibmagickcore5
+RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibmagickwand5
+RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibncurses5
+RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibotf-utils
RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibotf0
-RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibotf-utils
RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibpixman1-0
RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibpng12-0
RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibrsvg2-2
@@ -342,6 +357,7 @@
RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibtiff3
RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibxft2
RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibxml2-2
+RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibxpm4
RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibxrender
RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibz1
RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWorbit2
@@ -374,8 +390,11 @@
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
+RUNTIME_DEP_PKGS_CSWemacs-nox = CSWemacs-bin-common
+RUNTIME_DEP_PKGS_CSWemacs-nox += CSWemacs-common
+RUNTIME_DEP_PKGS_CSWemacs-nox += CSWlibgnutls26
+RUNTIME_DEP_PKGS_CSWemacs-nox += CSWlibncurses5
+RUNTIME_DEP_PKGS_CSWemacs-nox += CSWlibxml2-2
CHECKPKG_OVERRIDES_CSWemacs-nox += file-with-bad-content|/usr/local|root/opt/csw/bin/emacs-$(VERSION)-nox
CHECKPKG_OVERRIDES_CSWemacs-nox += file-with-bad-content|/usr/share|root/opt/csw/bin/emacs-$(VERSION)-nox
CHECKPKG_OVERRIDES_CSWemacs-nox += file-with-bad-content|/usr/local|root/opt/csw/bin/emacs-nox
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