[csw-devel] SF.net SVN: gar:[8439] csw/mgar/pkg/clearsilver/trunk

[dmichelsen at users.sourceforge.net]

Revision: 8439
          http://gar.svn.sourceforge.net/gar/?rev=8439&view=rev
Author:   dmichelsen
Date:     2010-02-09 14:58:06 +0000 (Tue, 09 Feb 2010)

Log Message:
-----------
clearsilver: Minor fixes, doesn't compile cleanly yet

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

Added Paths:
-----------
    csw/mgar/pkg/clearsilver/trunk/files/0001-Do-not-use-Wall-on-Sun-Studio.patch

Modified: csw/mgar/pkg/clearsilver/trunk/Makefile
===================================================================
--- csw/mgar/pkg/clearsilver/trunk/Makefile	2010-02-09 14:38:25 UTC (rev 8438)
+++ csw/mgar/pkg/clearsilver/trunk/Makefile	2010-02-09 14:58:06 UTC (rev 8439)
@@ -12,11 +12,15 @@
 
 MASTER_SITES = http://www.clearsilver.net/downloads/
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
+PATCHFILES = perlbuild.diff
+PATCHFILES += 0001-Do-not-use-Wall-on-Sun-Studio.patch
 
+LICENSE = LICENSE
+
 PACKAGES = CSWcs CSWpmcs CSWpycs
 
 RUNTIME_DEP_PKGS_CSWcs   = CSWzlib CSWggettextrt
-RUNTIME_DEP_PKGS_CSWpmcs = CSWcs CSWperl
+RUNTIME_DEP_PKGS_CSWpmcs = CSWcs CSWperl CSWggettextrt CSWzlib
 RUNTIME_DEP_PKGS_CSWpycs = CSWcs CSWpython
 
 CATALOGNAME_CSWcs   = clearsilver
@@ -27,22 +31,15 @@
 SPKG_DESC_CSWpmcs = Clearsilver Perl language binding
 SPKG_DESC_CSWpycs = Clearsilver Python language binding
 
-PKGFILES_CSWpmcs  = $(libdir)/perl/.*
-PKGFILES_CSWpmcs += $(mandir)/.*perl.*
-PKGFILES_CSWpycs  = $(libdir)/python.*/.*
-PKGFILES_CSWpycs += $(mandir)/.*python.*
+PKGFILES_CSWpmcs  = .*perl.*
+PKGFILES_CSWpycs  = .*python.*
 
-EXTRA_MERGE_EXCLUDE_FILES = .*\.pyo .*\.pyc
-PROTOTYPE_FILTER = awk '$$$$3 ~ /.*\.py$$$$/ { $$$$2 = "cswpycompile" } { print }'
-SPKG_CLASSES = none cswpycompile
-RUNTIME_DEP_PKGS += CSWcswclassutils
+PYCOMPILE = 1
 
 # We define upstream file regex so we can be notifed of 
 # new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*)
 
-PATCHFILES += perlbuild.diff
-
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --with-python=$(bindir)/python
 CONFIGURE_ARGS += --with-perl=$(bindir)/perl
@@ -62,12 +59,15 @@
 # No test target
 TEST_SCRIPTS =
 
+EXTRA_MERGE_EXCLUDE_FILES = .*/perllocal\.pod
+
 include gar/category.mk
 
 PATH := $(PATH):$(SOS11_CC_HOME)/bin
 
 ## Move lone perl manpage to the package man location
 post-install-modulated:
-	@(gmv $(INSTALLISADIR)$(prefix)/man/man3/ClearSilver.3perl \
-		$(INSTALLISADIR)$(prefix)/share/man/man3/ClearSilver.3perl)
-	@(grm -fr $(INSTALLISADIR)$(prefix)/man/man3)
+	gmv $(INSTALLISADIR)$(prefix)/man/man3/ClearSilver.3perl \
+		$(INSTALLISADIR)$(prefix)/share/man/man3/ClearSilver.3perl
+	grm -fr $(INSTALLISADIR)$(prefix)/man/man3
+	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/clearsilver/trunk/checksums
===================================================================
--- csw/mgar/pkg/clearsilver/trunk/checksums	2010-02-09 14:38:25 UTC (rev 8438)
+++ csw/mgar/pkg/clearsilver/trunk/checksums	2010-02-09 14:58:06 UTC (rev 8439)
@@ -1,2 +1,3 @@
-b8c0c7fbe0ef5e06e0c935f134304d44  download/clearsilver-0.10.5.tar.gz
-1c25fda8bb2666658d8ddcf3ad9b7235  download/perlbuild.diff
+48928da718dbcd215c1c31534b9679c2  0001-Do-not-use-Wall-on-Sun-Studio.patch
+b8c0c7fbe0ef5e06e0c935f134304d44  clearsilver-0.10.5.tar.gz
+1c25fda8bb2666658d8ddcf3ad9b7235  perlbuild.diff

Added: csw/mgar/pkg/clearsilver/trunk/files/0001-Do-not-use-Wall-on-Sun-Studio.patch
===================================================================
--- csw/mgar/pkg/clearsilver/trunk/files/0001-Do-not-use-Wall-on-Sun-Studio.patch	                        (rev 0)
+++ csw/mgar/pkg/clearsilver/trunk/files/0001-Do-not-use-Wall-on-Sun-Studio.patch	2010-02-09 14:58:06 UTC (rev 8439)
@@ -0,0 +1,25 @@
+From 8768d20d192fde3c7de11cf994c374dae57657ea Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Tue, 9 Feb 2010 15:20:31 +0100
+Subject: [PATCH] Do not use Wall on Sun Studio
+
+---
+ rules.mk.in |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/rules.mk.in b/rules.mk.in
+index 2bb9ce4..8083a33 100644
+--- a/rules.mk.in
++++ b/rules.mk.in
+@@ -84,7 +84,7 @@ PERL	   = @PERL@
+ RUBY       = @RUBY@
+ 
+ CPPFLAGS   = -I$(NEOTONIC_ROOT) @CPPFLAGS@
+-CFLAGS     = @CFLAGS@ -Wall $(CPPFLAGS) $(PICFLG)
++CFLAGS     = @CFLAGS@ $(CPPFLAGS) $(PICFLG)
+ OUTPUT_OPTION = -o $@
+ LD         = $(CC) -o
+ LDFLAGS    = -L$(LIB_DIR) @LDFLAGS@
+-- 
+1.6.5.1
+


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