[csw-devel] SF.net SVN: gar:[12985] csw/mgar/pkg/imlib/trunk

[dmichelsen at users.sourceforge.net]

Revision: 12985
          http://gar.svn.sourceforge.net/gar/?rev=12985&view=rev
Author:   dmichelsen
Date:     2011-01-17 15:30:15 +0000 (Mon, 17 Jan 2011)

Log Message:
-----------
imlib: Roll back to CSW X11

Modified Paths:
--------------
    csw/mgar/pkg/imlib/trunk/Makefile
    csw/mgar/pkg/imlib/trunk/checksums

Modified: csw/mgar/pkg/imlib/trunk/Makefile
===================================================================
--- csw/mgar/pkg/imlib/trunk/Makefile	2011-01-17 15:29:39 UTC (rev 12984)
+++ csw/mgar/pkg/imlib/trunk/Makefile	2011-01-17 15:30:15 UTC (rev 12985)
@@ -6,32 +6,40 @@
 define BLURB
 endef
 
-MASTER_SITES = $(SF_MIRRORS)
+MASTER_SITES = $(GNOME_MIRROR)
 DISTFILES  = $(NAME)-$(VERSION).tar.bz2
 
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2
 
-EXTRA_INC = $(prefix)/X11/include
-EXTRA_LIB = $(prefix)/X11/lib
-EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib
-
-# EXTRA_LINKER_FLAGS = -L$(libdir) -l/usr/openwin/lib/libXext.so
-
 STRIP_LIBTOOL = 1
 
-BUILD64 = 1
+# Make glib and gtk 64 bit first
+# BUILD64 = 1
+NOISAEXEC = 1
+sysconfdir = /etc/opt/csw
 CONFIGURE_ARGS = $(DIRPATHS)
-CONFIGURE_ARGS += --x-include=$(prefix)/X11/include
-CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR))
 
+PRESERVECONF += $(sysconfdir)/im_palette-small.pal
+PRESERVECONF += $(sysconfdir)/im_palette-tiny.pal
+PRESERVECONF += $(sysconfdir)/im_palette.pal
+PRESERVECONF += $(sysconfdir)/imrc
 
-RUNTIME_DEP_PKGS_CSWimlib  = CSWgiflib CSWjpeg CSWpng CSWtiff CSWzlib
-RUNTIME_DEP_PKGS_CSWimlib += CSWlibice CSWlibsm CSWlibxext
+RUNTIME_DEP_PKGS_CSWimlib += CSWjpeg
+RUNTIME_DEP_PKGS_CSWimlib += CSWpng
+RUNTIME_DEP_PKGS_CSWimlib += CSWtiff
+RUNTIME_DEP_PKGS_CSWimlib += CSWzlib
+RUNTIME_DEP_PKGS_CSWimlib += CSWglib
+RUNTIME_DEP_PKGS_CSWimlib += CSWgiflibrt
+RUNTIME_DEP_PKGS_CSWimlib += CSWgtk
 
 # Building the test cases misses -lX11, disable for now
 SKIPTEST ?= 1
 
 TEST_TARGET = check
 
+# No package refactoring for now
+CHECKPKG_OVERRIDES_CSWimlib += shared-lib-package-contains-so-symlink
+CHECKPKG_OVERRIDES_CSWimlib += non-uniform-lib-versions-in-package
+
 include gar/category.mk

Modified: csw/mgar/pkg/imlib/trunk/checksums
===================================================================
--- csw/mgar/pkg/imlib/trunk/checksums	2011-01-17 15:29:39 UTC (rev 12984)
+++ csw/mgar/pkg/imlib/trunk/checksums	2011-01-17 15:30:15 UTC (rev 12985)
@@ -1 +1 @@
-7db987e6c52e4daf70d7d0f471238eae  download/imlib-1.9.15.tar.bz2
+7db987e6c52e4daf70d7d0f471238eae  imlib-1.9.15.tar.bz2


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