[csw-devel] SF.net SVN: gar:[10364] csw/mgar/pkg/imlib2/trunk

[dmichelsen at users.sourceforge.net]

Revision: 10364
          http://gar.svn.sourceforge.net/gar/?rev=10364&view=rev
Author:   dmichelsen
Date:     2010-06-28 12:01:19 +0000 (Mon, 28 Jun 2010)

Log Message:
-----------
imlib2: Build against SUNW X11 again and fix 64 bit

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

Modified: csw/mgar/pkg/imlib2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/imlib2/trunk/Makefile	2010-06-28 03:59:07 UTC (rev 10363)
+++ csw/mgar/pkg/imlib2/trunk/Makefile	2010-06-28 12:01:19 UTC (rev 10364)
@@ -1,5 +1,5 @@
 GARNAME = imlib2
-GARVERSION = 1.4.3
+GARVERSION = 1.4.4
 CATEGORIES = lib
 
 DESCRIPTION = Imlib 2 is the successor to Imlib, a powerful graphics library
@@ -18,17 +18,15 @@
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2
 
 RUNTIME_DEP_PKGS = CSWbzip2 CSWftype2 CSWgiflibrt CSWjpeg CSWlibid3tag
-RUNTIME_DEP_PKGS += CSWlibxext CSWpng CSWtiff CSWzlib CSWlibx11
+RUNTIME_DEP_PKGS += CSWpng CSWtiff CSWzlib
 
-EXTRA_INC = $(prefix)/X11/include
-EXTRA_LIB = $(prefix)/X11/lib
-EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib
-
 BUILD64 = 1
+NOISAEXEC = 1
 CONFIGURE_ARGS = $(DIRPATHS)
-CONFIGURE_ARGS += --x-include=$(prefix)/X11/include
-CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR))
 
 TEST_TARGET = check
 
+MERGE_SCRIPTS_isa-extra = copy-relocated-only copy-config-only
+MERGE_DIRS_isa-extra = $(libdir)
+
 include gar/category.mk

Modified: csw/mgar/pkg/imlib2/trunk/checksums
===================================================================
--- csw/mgar/pkg/imlib2/trunk/checksums	2010-06-28 03:59:07 UTC (rev 10363)
+++ csw/mgar/pkg/imlib2/trunk/checksums	2010-06-28 12:01:19 UTC (rev 10364)
@@ -1 +1 @@
-cdac0d47eca6023e3e2a18584d3f6940  imlib2-1.4.3.tar.bz2
+b6de51879502e857d5b1f7622267a030  imlib2-1.4.4.tar.bz2


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