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

[dmichelsen at users.sourceforge.net]

Revision: 9556
          http://gar.svn.sourceforge.net/gar/?rev=9556&view=rev
Author:   dmichelsen
Date:     2010-04-06 13:03:25 +0000 (Tue, 06 Apr 2010)

Log Message:
-----------
giflib: Split off CSW X11 and SUNW X11

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

Modified: csw/mgar/pkg/giflib/trunk/Makefile
===================================================================
--- csw/mgar/pkg/giflib/trunk/Makefile	2010-04-06 12:24:53 UTC (rev 9555)
+++ csw/mgar/pkg/giflib/trunk/Makefile	2010-04-06 13:03:25 UTC (rev 9556)
@@ -24,9 +24,9 @@
 CATALOGNAME_CSWungif = libungif
 
 SPKG_DESC_CSWgiflib = A library for reading and writing gif images
-SPKG_DESC_CSWgiflibrt = giflib runtime libraries (minimal alternative without X11 support)
-SPKG_DESC_CSWgiflibrtx11 = giflib runtime libraries (full alternative with support for CSW X11)
-SPKG_DESC_CSWgiflibdoc = giflib documentation
+SPKG_DESC_CSWgiflibrt = Runtime library for giflib (Sun X11 binding)
+SPKG_DESC_CSWgiflibrtx11 = Runtime library for giflib (OpenCSW X11 binding)
+SPKG_DESC_CSWgiflibdoc = Documentation for giflib
 SPKG_DESC_CSWungif = Stub which links to giflib now the patent is dropped
 
 SPKG_SOURCEURL = http://giflib.sourceforge.net/
@@ -38,70 +38,71 @@
 RUNTIME_DEP_PKGS_CSWgiflib = CSWgiflibrt
 RUNTIME_DEP_PKGS_CSWungif = CSWgiflib
 
-EXTRA_MODULATORS = FEATURES
-MODULATIONS_FEATURES = nox11 cswx11
+EXTRA_MODULATORS = X11
+MODULATIONS_X11 = sunwx11 cswx11
 
-EXTRA_INC = $(prefix)/X11/include
-EXTRA_LIB = $(prefix)/X11/lib
-EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib
+EXTRA_INC_cswx11 = $(prefix)/X11/include
+EXTRA_LIB_cswx11 = $(prefix)/X11/lib
+EXTRA_PKG_CONFIG_DIRS_cswx11 = $(prefix)/X11/lib
 
+EXTRA_INC = $(EXTRA_INC_$(X11))
+EXTRA_LIB = $(EXTRA_LIB_$(X11))
+EXTRA_PKG_CONFIG_DIRS = $(EXTRA_PKG_CONFIG_DIRS_$(X11))
+
 STRIP_LIBTOOL = 1
 
 BUILD64 = 1
 
+prefix_cswx11 = $(BUILD_PREFIX)/X11
+prefix = $(or $(prefix_$(X11)),$(BUILD_PREFIX))
+
 CONFIGURE_ARGS = $(DIRPATHS)
 
-CONFIGURE_ARGS_nox11   = --disable-x11
+CONFIGURE_ARGS_sunwx11  = --x-includes=/usr/openwin/include
+CONFIGURE_ARGS_sunwx11 += --x-libraries=$(abspath /usr/openwin/lib/$(MM_LIBDIR))
 CONFIGURE_ARGS_cswx11  = --x-include=$(prefix)/X11/include
 CONFIGURE_ARGS_cswx11 += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR))
-CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(FEATURES))
+CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(X11))
 
 TEST_TARGET = check
 
-EXTRA_PAX_ARGS-32 = -s ",\(\.$(libdir)/libgif\)\(\.so\.4\.1\.6\),\1-$(FEATURES)\2,p"
-EXTRA_PAX_ARGS-32 += -s ",\(\.$(bindir)/gif2x11\),\1,p"
-EXTRA_PAX_ARGS-64 = -s ",\.$(libdir)/libgif\(\.so\.4\.1\.6\),.$(libdir_install)/$(ISA)/libgif-$(FEATURES)\1,p"
-EXTRA_PAX_ARGS += $(EXTRA_PAX_ARGS-$(MEMORYMODEL))
-
 # We don't want 64 bit executables as they gain no speed
 NOISAEXEC = 1
 
-MERGE_SCRIPTS_isa-default-features-nox11 = copy-all
-MERGE_SCRIPTS_isa-default64-features-nox11 = copy-relocated-only
-MERGE_DIRS_isa-default64-features-nox11 = $(libdir)
-MERGE_SCRIPTS_isa-default-features-cswx11 = copy-only
-MERGE_DIRS_isa-default-features-cswx11 = $(libdir)
-MERGE_SCRIPTS_isa-default64-features-cswx11 = copy-relocated-only
-MERGE_DIRS_isa-default64-features-cswx11 = $(libdir)
+MERGE_SCRIPTS_isa-default-x11-sunwx11 = copy-all
+MERGE_SCRIPTS_isa-default64-x11-sunwx11 = copy-relocated-only
+MERGE_DIRS_isa-default64-x11-sunwx11 = $(libdir)
+MERGE_SCRIPTS_isa-default-x11-cswx11 = copy-only
+MERGE_DIRS_isa-default-x11-cswx11 = $(libdir)
+MERGE_SCRIPTS_isa-default64-x11-cswx11 = copy-relocated-only
+MERGE_DIRS_isa-default64-x11-cswx11 = $(libdir)
 
 ARCHALL_CSWgiflibdoc = 1
 ARCHALL_CSWungif = 1
 
-PKGFILES_CSWgiflibrt = .*/libgif-nox11\..*
-PKGFILES_CSWgiflibrtx11 = .*/libgif-cswx11\..* $(bindir)/gif2x11
+PKGFILES_CSWgiflibrt = $(PKGFILES_RT)
+PKGFILES_CSWgiflibrtx11 = $(prefix)/X11/.*
 PKGFILES_CSWgiflibdoc = $(PKGFILES_DOC)
 PKGFILES_CSWungif = .*/libungif\..*
 
-ALTERNATIVES_CSWgiflibrt = nox11
-ALTERNATIVES_CSWgiflibrtx11 = cswx11
+CHECKPKG_OVERRIDES_CSWgiflib += linked-against-discouraged-library|libgif.so.4.1.6|libX11.so.4
+CHECKPKG_OVERRIDES_CSWgiflib += bad-rpath-entry|/usr/openwin/lib/64
+CHECKPKG_OVERRIDES_CSWgiflib += surplus-dependency|CSWgiflibrt
+CHECKPKG_OVERRIDES_CSWgiflibrt += linked-against-discouraged-library|libgif.so.4.1.6|libX11.so.4
+CHECKPKG_OVERRIDES_CSWungif += surplus-dependency|CSWgiflib
 
-ALTERNATIVE_nox11  = $(libdir)/libgif.so.4.1.6 giflib $(libdir)/libgif-nox11.so.4.1.6 100
-ALTERNATIVE_nox11 += $(libdir)/$(ISA_DEFAULT64)/libgif.so.4.1.6 giflib64 $(libdir)/$(ISA_DEFAULT64)/libgif-nox11.so.4.1.6
-
-ALTERNATIVE_cswx11  = $(libdir)/libgif.so.4.1.6 giflib $(libdir)/libgif-cswx11.so.4.1.6 200
-ALTERNATIVE_cswx11 += $(libdir)/$(ISA_DEFAULT64)/libgif.so.4.1.6 giflib64 $(libdir)/$(ISA_DEFAULT64)/libgif-cswx11.so.4.1.6
-
 include gar/category.mk
 
 DOCFILES = AUTHORS BUGS COPYING ChangeLog DEVELOPERS INSTALL NEWS ONEWS README TODO
 
 post-install-modulated:
-	@mkdir -p $(DESTDIR)$(docdir)/giflib
+	mkdir -p $(DESTDIR)$(docdir)/giflib
 	cd $(WORKSRC) && cp $(DOCFILES) $(DESTDIR)$(docdir)/giflib
 	cd $(WORKSRC)/doc && cp *.html *.png *.txt $(DESTDIR)$(docdir)/giflib
 	@$(MAKECOOKIE)
 
 post-merge:
+	mkdir -p $(PKGROOT)$(libdir)
 	gln -s libgif.so.4 $(PKGROOT)$(libdir)/libungif.so.4
 	gln -s libgif.so $(PKGROOT)$(libdir)/libungif.so
 	@$(MAKECOOKIE)


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