[csw-devel] SF.net SVN: gar:[15728] csw/mgar/pkg

[dmichelsen at users.sourceforge.net]

Revision: 15728
          http://gar.svn.sourceforge.net/gar/?rev=15728&view=rev
Author:   dmichelsen
Date:     2011-09-24 08:01:34 +0000 (Sat, 24 Sep 2011)
Log Message:
-----------
jpeg: Rename to libjpeg7, split packages

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

Added Paths:
-----------
    csw/mgar/pkg/libjpeg7/

Removed Paths:
-------------
    csw/mgar/pkg/jpeg/

Modified: csw/mgar/pkg/libjpeg7/trunk/Makefile
===================================================================
--- csw/mgar/pkg/jpeg/trunk/Makefile	2011-08-28 19:44:23 UTC (rev 15455)
+++ csw/mgar/pkg/libjpeg7/trunk/Makefile	2011-09-24 08:01:34 UTC (rev 15728)
@@ -4,40 +4,44 @@
 
 DESCRIPTION = JPEG library and tools by the Independent JPEG Group
 define BLURB
-  Long description
 endef
 
 MASTER_SITES = http://www.ijg.org/files/
 DISTFILES  = $(NAME)src.v$(VERSION).tar.gz
 
-PACKAGES = CSWjpeg CSWjpegrt CSWjpegdevel
+VENDOR_URL = http://www.ijg.org
+
+LICENSE = README
+
+FOREIGN_PACKAGES += CSWlibjpeg62
+
+PACKAGES += CSWjpeg
 CATALOGNAME_CSWjpeg = jpeg
-CATALOGNAME_CSWjpegrt = jpeg_rt
-CATALOGNAME_CSWjpegdevel = jpeg_devel
-
 SPKG_DESC_CSWjpeg += JPEG library and tools by the Independent JPEG Group
-SPKG_DESC_CSWjpegrt += JPEG library and tools by the Independent JPEG Group - runtime package
-SPKG_DESC_CSWjpegdevel += JPEG library and tools by the Independent JPEG Group - developer pa ckage
+# PKGFILES is catchall
+RUNTIME_DEP_PKGS_CSWjpeg += CSWlibjpeg7 
+# This is for legacy packages compiled against libjpeg.so.62 and depend on the unified CSWjpeg which
+# contained both shared libraries in the past.
+RUNTIME_DEP_PKGS_CSWjpeg += CSWlibjpeg62
 
-RUNTIME_DEP_PKGS_CSWjpeg += CSWjpegrt 
-RUNTIME_DEP_PKGS_CSWjpegrt += 
-RUNTIME_DEP_PKGS_CSWjpegdevel += CSWjpegrt
+# Overwrite this for now until the package has been released
+CHECKPKG_OVERRIDES_CSWjpeg += surplus-dependency|CSWlibjpeg62
+CHECKPKG_OVERRIDES_CSWjpeg += unidentified-dependency|CSWlibjpeg62
 
-PKGFILES_CSWjpegrt = $(PKGFILES_RT)
-PKGFILES_CSWjpegdevel = $(PKGFILES_DEVEL)
+PACKAGES += CSWlibjpeg7
+SPKG_DESC_CSWlibjpeg7 += JPEG library and tools by the Independent JPEG Group, libjpeg.so.7
+PKGFILES_CSWlibjpeg7 = $(call pkgfiles_lib,libjpeg.so.7)
 
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2
+PACKAGES += CSWlibjpeg-dev
+SPKG_DESC_CSWlibjpeg-dev += Development files for libjpeg.so.7
+PKGFILES_CSWlibjpeg-dev += $(PKGFILES_DEVEL)
+RUNTIME_DEP_PKGS_CSWlibjpeg-dev += CSWlibjpeg7
 
-SPKG_SOURCEURL = http://www.ijg.org
-
 BUILD64 = 1
+ISAEXEC = 1
 
 STRIP_LIBTOOL = 1
 
-EXTRA_INC = $(prefix)/X11/include
-EXTRA_LIB = $(prefix)/X11/lib
-EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib
-
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --enable-shared
 

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