[csw-devel] SF.net SVN: gar:[14675] csw/mgar/pkg/gd/trunk

[ellson at users.sourceforge.net]

Revision: 14675
          http://gar.svn.sourceforge.net/gar/?rev=14675&view=rev
Author:   ellson
Date:     2011-05-31 04:19:57 +0000 (Tue, 31 May 2011)

Log Message:
-----------
gd: update to gd-2.0.36RC1 (latest, or perhaps last available release of gd)

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

Added Paths:
-----------
    csw/mgar/pkg/gd/trunk/files/gdkanji.c.patch

Modified: csw/mgar/pkg/gd/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gd/trunk/Makefile	2011-05-31 03:18:18 UTC (rev 14674)
+++ csw/mgar/pkg/gd/trunk/Makefile	2011-05-31 04:19:57 UTC (rev 14675)
@@ -1,5 +1,5 @@
 NAME = gd
-VERSION = 2.0.35
+VERSION = 2.0.36RC1
 CATEGORIES = lib
 
 DESCRIPTION = A library used for dynamic image creation
@@ -13,8 +13,14 @@
 endef
 
 MASTER_SITES = http://www.libgd.org/releases/
-DISTFILES  = $(NAME)-$(VERSION).tar.bz2
+# Master site down.  This version archived at:  http://www.graphviz.org/pub/tmp/gd-2.0.36RC1.tar.gz
+#     Contact:  ellson at opencsw.org
+DISTFILES  = $(NAME)-$(VERSION).tar.gz
 
+PATCHFILES += gdkanji.c.patch
+
+#GARCOMPILER = GCC4
+
 PACKAGES = CSWgd
 CATALOGNAME_CSWgd = gd
 SPKG_DESC_CSWgd = Utilities facilitating libgd for dynamic image creation
@@ -47,7 +53,7 @@
 PKGFILES_CSWlibgd-dev = $(PKGFILES_DEVEL)
 RUNTIME_DEP_PKGS_CSWlibgd-dev = CSWlibgd2
 
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2
+UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
 
 CSW_DEFAULT_FONTPATH = $(sharedstatedir)/fonts/truetype
 
@@ -88,8 +94,8 @@
 
 # The shipped libtool doesn't know about Sun Studio C++ compiler 'CC'
 pre-configure-modulated:
-	grm -f $(WORKSRC)/config/ltmain.sh
-	gcp /opt/csw/share/libtool/config/ltmain.sh $(WORKSRC)/config/ltmain.sh
-	cd $(WORKSRC) && aclocal && automake
+#	grm -f $(WORKSRC)/config/ltmain.sh
+#	gcp /opt/csw/share/libtool/config/ltmain.sh $(WORKSRC)/config/ltmain.sh
+#	cd $(WORKSRC) && aclocal && automake
 	@$(MAKECOOKIE)
 

Modified: csw/mgar/pkg/gd/trunk/checksums
===================================================================
--- csw/mgar/pkg/gd/trunk/checksums	2011-05-31 03:18:18 UTC (rev 14674)
+++ csw/mgar/pkg/gd/trunk/checksums	2011-05-31 04:19:57 UTC (rev 14675)
@@ -1,3 +1,2 @@
-88e69d03742a55f979e2822d97c525c1  download/Makefile.diff
-c9a4f9ee0fdef233a2ab0f5394672f2c  download/fixme.sh
-6c6c3dbb7bf079e0bb5fbbfd3bb8a71c  download/gd-2.0.35.tar.bz2
+1eb8ddb8d9fc77f7502bb6cbcd706c08  gdkanji.c.patch
+39ac48e6d5e0012a3bd2248a0102f209  gd-2.0.36RC1.tar.gz

Added: csw/mgar/pkg/gd/trunk/files/gdkanji.c.patch
===================================================================
--- csw/mgar/pkg/gd/trunk/files/gdkanji.c.patch	                        (rev 0)
+++ csw/mgar/pkg/gd/trunk/files/gdkanji.c.patch	2011-05-31 04:19:57 UTC (rev 14675)
@@ -0,0 +1,11 @@
+--- gd-2.0.36RC1/gdkanji.c.orig	2011-05-31 06:03:47.966209006 +0200
++++ gd-2.0.36RC1/gdkanji.c	2011-05-31 06:04:22.097778848 +0200
+@@ -25,7 +25,7 @@
+ #endif
+ 
+ #ifndef HAVE_ICONV
+-#define ICONV_CONST /**/
++#define ICONV_CONST const
+   iconv_t iconv_open (const char *, const char *);
+ size_t iconv (iconv_t, ICONV_CONST char **, size_t *, char **, size_t *);
+ int iconv_close (iconv_t);


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