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

[valholla at users.sourceforge.net]

Revision: 3513
          http://gar.svn.sourceforge.net/gar/?rev=3513&view=rev
Author:   valholla
Date:     2009-02-27 04:27:34 +0000 (Fri, 27 Feb 2009)

Log Message:
-----------
merge gd and gd_devel

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

Added Paths:
-----------
    csw/mgar/pkg/gd/trunk/files/fixme.sh

Modified: csw/mgar/pkg/gd/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gd/trunk/Makefile	2009-02-27 04:11:25 UTC (rev 3512)
+++ csw/mgar/pkg/gd/trunk/Makefile	2009-02-27 04:27:34 UTC (rev 3513)
@@ -2,30 +2,29 @@
 GARVERSION = 2.0.35
 CATEGORIES = lib
 
-DESCRIPTION = A library used to create PNG images
+DESCRIPTION = A library used for dynamic image creation
 define BLURB
-  gd is a library used to create PNG, JPEG, or WBMP images. It has many nice
-  features and can be used in scripts (e.g. PHP) for dynamic image generation.
+	GD is an open source code library for the dynamic creation of 
+	images by programmers. GD creates PNG, JPEG and GIF images, 
+	among other formats. GD is commonly used to generate charts, 
+	graphics, thumbnails, and most anything else, on the fly. 
+	While not restricted to use on the web, the most common 
+	applications of GD involve web site development.
 endef
 
 MASTER_SITES = http://www.libgd.org/releases/
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.bz2
 DISTFILES += fixme.sh
 
-PACKAGES = CSWgd CSWgd-devel
+PACKAGES = CSWgd
 CATALOGNAME_CSWgd = gd
-CATALOGNAME_CSWgd-devel = gd_devel
 SPKG_DESC_CSWgd = $(DESCRIPTION)
-SPKG_DESC_CSWgd-devel = Development headers and libraries for gd
 
 PATCHFILES = Makefile.diff
 
 REQUIRED_PKGS_CSWgd  = CSWexpat CSWfconfig CSWftype2 CSWiconv 
 REQUIRED_PKGS_CSWgd += CSWjpeg CSWpng CSWxpm CSWzlib
-REQUIRED_PKGS_CSWgd-devel = CSWgd
 
-PKGFILES_CSWgd-devel = $(PKGFILES_DEVEL)
-
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2
 

Modified: csw/mgar/pkg/gd/trunk/checksums
===================================================================
--- csw/mgar/pkg/gd/trunk/checksums	2009-02-27 04:11:25 UTC (rev 3512)
+++ csw/mgar/pkg/gd/trunk/checksums	2009-02-27 04:27:34 UTC (rev 3513)
@@ -1,3 +1,3 @@
 6c6c3dbb7bf079e0bb5fbbfd3bb8a71c  download/gd-2.0.35.tar.bz2
-70771682427d524354d50482371edca5  download/fixme.sh
+41ec540885de7c34625768aa1fb9682b  download/fixme.sh
 88e69d03742a55f979e2822d97c525c1  download/Makefile.diff

Added: csw/mgar/pkg/gd/trunk/files/fixme.sh
===================================================================
--- csw/mgar/pkg/gd/trunk/files/fixme.sh	                        (rev 0)
+++ csw/mgar/pkg/gd/trunk/files/fixme.sh	2009-02-27 04:27:34 UTC (rev 3513)
@@ -0,0 +1,49 @@
+#!/bin/bash
+####################################################
+#
+#  fixme.sh
+#  Intended to remove the use of libtool's 
+#  pseudo-libraries for opencsw builds.
+#
+#  Author: Mike Watters  mwatters_at_opencsw.org
+#  Initial Version: 0.1
+#
+####################################################
+
+umask 0022
+PATH=/opt/csw/bin
+
+if [ $# -ne 1 ]; then
+    gecho "USAGE: $(basename $0) WORKSRC"
+    exit 1
+fi
+BASEPATH=$1
+
+## Fix Makefiles
+for mk in $(gfind ${BASEPATH} -name Makefile -print); do
+    LT_FILES=$(ggrep '/opt/csw.*/lib/.*\.la' ${mk} | \
+        gsed "s/^.*\(\/opt\/csw.*\/lib\/.*\.la\).*$/\1/")
+    
+    for file in ${LT_FILES}; do
+        LIB_NAME=$(ggrep 'dlname=' ${file} | \
+            gsed -e "s/.*'\(.*\)'/\1/" \
+                -e "s/^lib//" \
+                -e "s/\.so.*$//")
+        fixpath=$(gecho $file |gsed 's/\//\\\//g')
+        gsed "s/${fixpath}/-l${LIB_NAME}/g" ${mk} >Makefile.new
+        gmv Makefile.new ${mk}
+    done
+done
+
+## Fix libtool Script
+for lt in $(gfind ${BASEPATH} -name libtool -print); do
+    gsed "/for search_ext in .*\.la/s/\.la//" ${lt} >${lt}.new
+    gmv ${lt}.new ${lt}
+done
+
+LTMAIN=$(gfind ${BASEPATH} -name ltmain.sh -print)
+if [ -f ${LTMAIN} ]; then
+    gsed "/for search_ext in .*\.la/s/\.la//" ${LTMAIN} >${LTMAIN}.new
+    gmv ${LTMAIN}.new ${LTMAIN}
+fi
+


Property changes on: csw/mgar/pkg/gd/trunk/files/fixme.sh
___________________________________________________________________
Added: svn:executable
   + *


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