SF.net SVN: gar:[22471] csw/mgar/pkg/enchant/trunk

guengel at users.sourceforge.net guengel at users.sourceforge.net
Tue Nov 12 08:54:26 CET 2013 

Revision: 22471
          http://gar.svn.sourceforge.net/gar/?rev=22471&view=rev
Author:   guengel
Date:     2013-11-12 07:54:26 +0000 (Tue, 12 Nov 2013)
Log Message:
-----------
enchant/trunk: Package split. 64bit libraries provided.

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

Added Paths:
-----------
    csw/mgar/pkg/enchant/trunk/files/CSWlibenchant1.postmsg
    csw/mgar/pkg/enchant/trunk/files/changelog.CSW

Modified: csw/mgar/pkg/enchant/trunk/Makefile
===================================================================
--- csw/mgar/pkg/enchant/trunk/Makefile	2013-11-11 16:04:12 UTC (rev 22470)
+++ csw/mgar/pkg/enchant/trunk/Makefile	2013-11-12 07:54:26 UTC (rev 22471)
@@ -1,6 +1,7 @@
 NAME = enchant
 VERSION = 1.6.0
 GARTYPE = v2
+GARCOMPILER = GNU
 
 DESCRIPTION = A wrapper library for various spell checking engines
 define BLURB
@@ -8,68 +9,107 @@
 
 MASTER_SITES =  http://www.abisource.com/downloads/$(NAME)/$(VERSION)/
 DISTFILES  = $(NAME)-$(VERSION).tar.gz
-DISTNAME  = $(NAME)-$(VERSION)
+DISTFILES += changelog.CSW
+DISTFILES += CSWlibenchant1.postmsg
 SPKG_SOURCEURL = http://www.abisource.com/projects/enchant/
 
+PACKAGES = CSWenchant
+SPKG_DESC_CSWenchant += $(DESCRIPTION), meta package
+ARCHALL_CSWenchant = 1
+RUNTIME_DEP_PKGS_CSWenchant += CSWenchant-bin
+RUNTIME_DEP_PKGS_CSWenchant += CSWlibenchant1
+RUNTIME_DEP_PKGS_CSWenchant += CSWlibenchant-aspell
+RUNTIME_DEP_PKGS_CSWenchant += CSWlibenchant-ispell
+RUNTIME_DEP_PKGS_CSWenchant += CSWlibenchant-myspell
+CHECKPKG_OVERRIDES_CSWenchant += surplus-dependency|CSWenchant-bin
+CHECKPKG_OVERRIDES_CSWenchant += surplus-dependency|CSWlibenchant-aspell
+CHECKPKG_OVERRIDES_CSWenchant += surplus-dependency|CSWlibenchant-ispell
+CHECKPKG_OVERRIDES_CSWenchant += surplus-dependency|CSWlibenchant-myspell
+CHECKPKG_OVERRIDES_CSWenchant += surplus-dependency|CSWlibenchant1
 
-# THe subpackages just arent worth it, sizewise
-# Leaving the other stuff in for 
-#PACKAGES = CSWenchant CSWenchantrt CSWenchantdevel CSWenchantdoc
-#
-CATALOGNAME_CSWenchant = enchant
-CATALOGNAME_CSWenchantrt = enchant_rt
-CATALOGNAME_CSWenchantdevel = enchant_devel
-CATALOGNAME_CSWenchantdoc = enchant_doc
+PACKAGES +=  CSWenchant-bin
+SPKG_DESC_CSWenchant-bin += $(DESCRIPTION), runtime package
+PKGFILES_CSWenchant-bin  = $(bindir).*
+PKGFILES_CSWenchant-bin += $(mandir)/man1.*
+PKGFILES_CSWenchant-bin += $(docdir)/enchant_bin.*
+RUNTIME_DEP_PKGS_CSWenchant-bin += CSWlibenchant1
+RUNTIME_DEP_PKGS_CSWenchant-bin += CSWlibglib2-0-0
+# This is due to `ld -z ignore` issue on sparc, once resolved, deps can be removed
+RUNTIME_DEP_PKGS_CSWenchant-bin += CSWlibintl8
+CHECKPKG_OVERRIDES_CSWenchant-bin += surplus-dependency|CSWlibintl8
 
-SPKG_DESC_CSWenchant += $(DESCRIPTION)
-SPKG_DESC_CSWenchantrt += $(DESCRIPTION) - runtime package
-SPKG_DESC_CSWenchantdevel += $(DESCRIPTION) - developer package
-SPKG_DESC_CSWenchantdoc += $(DESCRIPTION) - documentation
+PACKAGES += CSWlibenchant1
+SPKG_DESC_CSWlibenchant1 = $(DESCRIPTION), libenchant.so.1
+PKGFILES_CSWlibenchant1 += $(call pkgfiles_lib,libenchant.so.1)
+PKGFILES_CSWlibenchant1 += $(sharedstatedir)/enchant.*
+PKGFILES_CSWlibenchant1 += $(docdir)/libenchant1.*
+POSTMSG_CSWlibenchant1 = /opt/csw/share/doc/libenchant1/CSWenchant.postmsg
+RUNTIME_DEP_PKGS_CSWlibenchant1 += CSWlibglib2-0-0
+RUNTIME_DEP_PKGS_CSWlibenchant1 += CSWlibgmodule2-0-0
+RUNTIME_DEP_PKGS_CSWlibenchant1 += CSWlibgcc-s1
+# This is due to `ld -z ignore` issue on sparc, once resolved, deps can be removed
+RUNTIME_DEP_PKGS_CSWlibenchant1 += CSWlibintl8
+CHECKPKG_OVERRIDES_CSWlibenchant1 += surplus-dependency|CSWlibintl8
 
-PKGFILES_CSWenchantrt = $(PKGFILES_RT)
-PKGFILES_CSWenchantrt += $(libdir)/.*\.so.*
-PKGFILES_CSWenchantdevel = $(PKGFILES_DEVEL)
-PKGFILES_CSWenchantdoc = $(sharedstatedir)/gtk-doc/.*
+PACKAGES += CSWlibenchant-aspell
+SPKG_DESC_CSWlibenchant-aspell = $(DESCRIPTION), aspell backend
+PKGFILES_CSWlibenchant-aspell  = .*enchant/libenchant_aspell.so
+PKGFILES_CSWlibenchant-aspell += $(docdir)/libenchant_aspell.*
+# Apparently, there is no aspell 64bit
+CHECKPKG_OVERRIDES_CSWlibenchant-aspell += 64-bit-binaries-missing
+RUNTIME_DEP_PKGS_CSWlibenchant-aspell += CSWlibaspell15
+RUNTIME_DEP_PKGS_CSWlibenchant-aspell += CSWlibenchant1
+RUNTIME_DEP_PKGS_CSWlibenchant-aspell += CSWlibglib2-0-0
+RUNTIME_DEP_PKGS_CSWlibenchant-aspell += CSWlibgcc-s1
+# This is due to `ld -z ignore` issue on sparc, once resolved, deps can be removed
+RUNTIME_DEP_PKGS_CSWlibenchant-aspell += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibenchant-aspell += CSWlibgmodule2-0-0
+CHECKPKG_OVERRIDES_CSWlibenchant-aspell += surplus-dependency|CSWlibintl8
+CHECKPKG_OVERRIDES_CSWlibenchant-aspell += surplus-dependency|CSWlibgmodule2-0-0
 
-ARCHALL_CSWenchantdoc = 1
+PACKAGES += CSWlibenchant-ispell
+SPKG_DESC_CSWlibenchant-ispell = $(DESCRIPTION), ispell backend
+PKGFILES_CSWlibenchant-ispell  = .*enchant/libenchant_ispell.so
+PKGFILES_CSWlibenchant-ispell += $(docdir)/libenchant_ispell.*
+RUNTIME_DEP_PKGS_CSWlibenchant-ispell += CSWlibenchant1
+RUNTIME_DEP_PKGS_CSWlibenchant-ispell += CSWlibglib2-0-0
+RUNTIME_DEP_PKGS_CSWlibenchant-ispell += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibenchant-ispell += CSWlibstdc++6
+# This is due to `ld -z ignore` issue on sparc, once resolved, deps can be removed
+RUNTIME_DEP_PKGS_CSWlibenchant-ispell += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibenchant-ispell += CSWlibgmodule2-0-0
+CHECKPKG_OVERRIDES_CSWlibenchant-ispell += surplus-dependency|CSWlibintl8
+CHECKPKG_OVERRIDES_CSWlibenchant-ispell += surplus-dependency|CSWlibgmodule2-0-0
 
-#RUNTIME_DEP_PKGS_CSWenchant += CSWenchantrt
-RUNTIME_DEP_PKGS_CSWenchant += CSWggettextrt
-RUNTIME_DEP_PKGS_CSWenchant += CSWglib2
-RUNTIME_DEP_PKGS_CSWenchant += CSWaspell
+PACKAGES += CSWlibenchant-myspell
+SPKG_DESC_CSWlibenchant-myspell = $(DESCRIPTION), myspell backend
+PKGFILES_CSWlibenchant-myspell  = .*enchant/libenchant_myspell.so
+PKGFILES_CSWlibenchant-myspell += $(docdir)/libenchant_myspell.*
+RUNTIME_DEP_PKGS_CSWlibenchant-myspell += CSWlibenchant1
+RUNTIME_DEP_PKGS_CSWlibenchant-myspell += CSWlibglib2-0-0
+RUNTIME_DEP_PKGS_CSWlibenchant-myspell += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibenchant-myspell += CSWlibstdc++6
+# This is due to `ld -z ignore` issue on sparc, once resolved, deps can be removed
+RUNTIME_DEP_PKGS_CSWlibenchant-myspell += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibenchant-myspell += CSWlibgmodule2-0-0
+CHECKPKG_OVERRIDES_CSWlibenchant-myspell += surplus-dependency|CSWlibintl8
+CHECKPKG_OVERRIDES_CSWlibenchant-myspell += surplus-dependency|CSWlibgmodule2-0-0
 
-### I dont know why someting thinks it needs dbus.
-### neither /opt/csw/bin/enchant, nor its libs, needs it.
-RUNTIME_DEP_PKGS_CSWenchantrt += CSWdbusglib
-RUNTIME_DEP_PKGS_CSWenchantrt += CSWlibdbus
+PACKAGES += CSWlibenchant-dev
+SPKG_DESC_CSWlibenchant-dev += $(DESCRIPTION) - developer package
+PKGFILES_CSWlibenchant-dev  = $(PKGFILES_DEVEL)
+PKGFILES_CSWlibenchant-dev += $(docdir)/libenchant_dev.*
+RUNTIME_DEP_PKGS_CSWlibenchant-dev += CSWlibenchant1
 
-RUNTIME_DEP_PKGS_CSWenchantrt += CSWggettextrt
-RUNTIME_DEP_PKGS_CSWenchantrt += CSWglib2
-#RUNTIME_DEP_PKGS_CSWenchantdevel += CSWenchantrt
-#RUNTIME_DEP_PKGS_CSWenchantdoc += 
+BUILD_DEP_PKGS += CSWlibdbus-glib-dev
+BUILD_DEP_PKGS += CSWlibglib2-dev
 
-BUILD_DEP_PKGS += CSWdbusglibdev
-
 LICENSE = COPYING.LIB
 
 UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2
 
+BUILD64 = 1
 
-#CHECKPKG_OVERRIDES_CSWenchant += symbol-not-found|enchant-lsmod
-#CHECKPKG_OVERRIDES_CSWenchant += symbol-not-found|enchant
-
-CHECKPKG_OVERRIDES_CSWenchant += soname-not-found|libenchant.so.1|is|needed|by|opt/csw/bin/enchant
-CHECKPKG_OVERRIDES_CSWenchant += soname-not-found|libenchant.so.1|is|needed|by|opt/csw/bin/enchant-lsmod
-
-#CHECKPKG_OVERRIDES_CSWenchantrt += symbol-not-found|libenchant_ispell.so
-#CHECKPKG_OVERRIDES_CSWenchantrt += symbol-not-found|libenchant_aspell.so
-#CHECKPKG_OVERRIDES_CSWenchantrt += symbol-not-found|libenchant_myspell.so
-
-
-#NOISALIST = 1
-# libdbus not 64-bit yet
-#BUILD64_LIBS_ONLY = 1
-
 STRIP_LIBTOOL = 1
 
 CONFIGURE_ARGS = $(DIRPATHS)
@@ -78,3 +118,8 @@
 include gar/category.mk
 
 PATH := /opt/csw/gnu:$(PATH)
+
+post-merge:
+	[ -d $(PKGROOT)$(docdir)/libenchant1/ ] || mkdir -p $(PKGROOT)$(docdir)/libenchant1/
+	ginstall $(FILEDIR)/CSWlibenchant1.postmsg $(PKGROOT)$(docdir)/libenchant1/
+	@$(MAKECOOKIE)

Added: csw/mgar/pkg/enchant/trunk/files/CSWlibenchant1.postmsg
===================================================================
--- csw/mgar/pkg/enchant/trunk/files/CSWlibenchant1.postmsg	                        (rev 0)
+++ csw/mgar/pkg/enchant/trunk/files/CSWlibenchant1.postmsg	2013-11-12 07:54:26 UTC (rev 22471)
@@ -0,0 +1,11 @@
+----
+
+ You might want to install the spell checking backends
+
+   CSWlibenchant-aspell
+   CSWlibenchant-ispell
+   CSWlibenchant-myspell
+
+ They can be installed individually or all toghether.
+
+----
\ No newline at end of file

Added: csw/mgar/pkg/enchant/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/enchant/trunk/files/changelog.CSW	                        (rev 0)
+++ csw/mgar/pkg/enchant/trunk/files/changelog.CSW	2013-11-12 07:54:26 UTC (rev 22471)
@@ -0,0 +1,17 @@
+enchant (1.6.0,REV=2013.11.12)
+
+  * Package split:
+	CSWenchant
+	CSWenchant-bin
+	CSWlibenchant1
+	CSWlibenchant-aspell
+	CSWlibenchant-ispell
+	CSWlibenchant-myspell
+	CSWlibenchant-dev
+
+  * CSWenchant is now a meta package, that pulls in all enchant
+    packages except for CSWlibenchant-dev.
+
+  * 64bit libraries provided.
+
+ -- Rafael Ostertag <raos at opencsw.org>  Tue, 12 Nov 2013 08:04:46 +0100

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