[csw-devel] SF.net SVN: gar:[21451] csw/mgar/pkg/gamin/trunk

[guengel at users.sourceforge.net]

Revision: 21451
          http://gar.svn.sourceforge.net/gar/?rev=21451&view=rev
Author:   guengel
Date:     2013-07-07 19:00:51 +0000 (Sun, 07 Jul 2013)
Log Message:
-----------
Adjusted to current autoconf/automake build system. Development package now depends on CSWlibfam0 due to https://www.opencsw.org/mantis/view.php?id=5085.

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

Added Paths:
-----------
    csw/mgar/pkg/gamin/trunk/files/0004-Adjust-configure.in.patch

Modified: csw/mgar/pkg/gamin/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gamin/trunk/Makefile	2013-07-07 14:53:24 UTC (rev 21450)
+++ csw/mgar/pkg/gamin/trunk/Makefile	2013-07-07 19:00:51 UTC (rev 21451)
@@ -3,6 +3,7 @@
 NAME = gamin
 VERSION = 0.1.10
 GARTYPE = v2
+GARCOMPILER = SOS12U3
 
 DESCRIPTION = GNOME replacement for FAM which watches for file alterations
 define BLURB
@@ -28,6 +29,8 @@
 
 PATCHFILES += 0003-Enable-64-bit-builds.patch
 
+PATCHFILES += 0004-Adjust-configure.in.patch
+
 VENDOR_URL = http://people.gnome.org/~veillard/gamin/
 
 PACKAGES += CSWlibfam0
@@ -43,19 +46,19 @@
 SPKG_DESC_CSWlibgamin-dev = Development files for libgamin-1.so.0 and legacy compat libfam.so.0
 PKGFILES_CSWlibgamin-dev += $(PKGFILES_DEVEL)
 RUNTIME_DEP_PKGS_CSWlibgamin-dev += CSWlibgamin1-0
-# That is a legacy-only library, no need to pull it in unless for legacy CSWfam
-CHECKPKG_OVERRIDES_CSWlibgamin-dev += missing-dependency|CSWlibfam0
+RUNTIME_DEP_PKGS_CSWlibgamin-dev += CSWlibfam0
 
 PACKAGES += CSWpy-gamin
 SPKG_DESC_CSWpy-gamin = Python bindings for GAMIN file alteration monitor
 PKGFILES_CSWpy-gamin += $(libdir)/site-packages/.*
 RUNTIME_DEP_PKGS_CSWpy-gamin += CSWpython
 RUNTIME_DEP_PKGS_CSWpy-gamin += CSWlibgamin1-0
+# Build choked when trying to build python for 64bit
+CHECKPKG_OVERRIDES_CSWpy-gamin += 64-bit-binaries-missing
 
 PACKAGES += CSWgamin
 SPKG_DESC_CSWgamin = GAMIN file alteration monitor daemon (compatible to FAM)
 # PKGFILES is catchall
-RUNTIME_DEP_PKGS_CSWgamin += CSWlibintl8
 RUNTIME_DEP_PKGS_CSWgamin += CSWlibglib2-0-0
 OBSOLETED_BY_CSWgamin += CSWfam
 
@@ -73,13 +76,18 @@
 # This is not passed to configure, although it is defined (but wrong) in configure.in
 EXTRA_CONFIGURE_EXPORTS += ENV_CFLAGS
 CONFIGURE_ENV_ENV_CFLAGS = $(CFLAGS)
+# Build chokes on G_CONST_RETURN
+# "gam_subscription.h", line 24: syntax error before or at: char
+# "gam_subscription.c", line 144: warning: old-style declaration or incorrect type for: G_CONST_RETURN
+EXTRA_CPPFLAGS = -DG_CONST_RETURN=const
 
-# No 64 bit Python yet
-CONFIGURE_ARGS-64 += --without-python
-
 CONFIGURE_ARGS += $(DIRPATHS)
 CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MEMORYMODEL))
 
+# Build chokes with python enabled for
+# 64bit
+CONFIGURE_ARGS-64 += --without-python
+
 PYCOMPILE = 1
 EXTRA_MERGE_EXCLUDE_FILES += .*\.pyo .*\.pyc
 EXTRA_PAX_ARGS += -s ,$(libdir)/python2.6/site-packages,$(libdir)/site-packages,

Added: csw/mgar/pkg/gamin/trunk/files/0004-Adjust-configure.in.patch
===================================================================
--- csw/mgar/pkg/gamin/trunk/files/0004-Adjust-configure.in.patch	                        (rev 0)
+++ csw/mgar/pkg/gamin/trunk/files/0004-Adjust-configure.in.patch	2013-07-07 19:00:51 UTC (rev 21451)
@@ -0,0 +1,33 @@
+From 0044c3dd9faee7fdcb0f01174df824f395f518f2 Mon Sep 17 00:00:00 2001
+From: Rafael Ostertag <raos at opencsw.org>
+Date: Sun, 7 Jul 2013 17:03:51 +0200
+Subject: [PATCH] Adjust configure.in
+
+---
+ configure.in | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index 87c7320..938f3e7 100644
+--- a/configure.in
++++ b/configure.in
+@@ -1,7 +1,7 @@
+ dnl Process this file with autoconf to produce a configure script.
+ AC_PREREQ(2.52)
+ AC_INIT(libgamin)
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+ AC_CANONICAL_SYSTEM
+ 
+ # get any external flags setting before we start playing with the CFLAGS variable
+@@ -31,7 +31,6 @@ AM_PROG_LIBTOOL
+ 
+ AC_USE_SYSTEM_EXTENSIONS
+ AC_PROG_CC
+-AM_PROG_CC_STDC
+ AC_HEADER_STDC
+ AC_PROG_INSTALL
+ AC_PROG_MAKE_SET
+-- 
+1.8.3.1
+

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