[csw-devel] SF.net SVN: gar:[3874] csw/mgar/pkg/pkgconfig/trunk

[dmichelsen at users.sourceforge.net]

Revision: 3874
          http://gar.svn.sourceforge.net/gar/?rev=3874&view=rev
Author:   dmichelsen
Date:     2009-03-23 14:55:58 +0000 (Mon, 23 Mar 2009)

Log Message:
-----------
pkgconfig: Move to mGAR v2, depend on CSWgettextrt and fix missing libglib2.la

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

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

Removed Paths:
-------------
    csw/mgar/pkg/pkgconfig/trunk/files/CSWpkgconfig.depend
    csw/mgar/pkg/pkgconfig/trunk/files/CSWpkgconfig.gspec

Property Changed:
----------------
    csw/mgar/pkg/pkgconfig/trunk/


Property changes on: csw/mgar/pkg/pkgconfig/trunk
___________________________________________________________________
Modified: svn:externals
   - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1

   + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2


Modified: csw/mgar/pkg/pkgconfig/trunk/Makefile
===================================================================
--- csw/mgar/pkg/pkgconfig/trunk/Makefile	2009-03-23 10:17:17 UTC (rev 3873)
+++ csw/mgar/pkg/pkgconfig/trunk/Makefile	2009-03-23 14:55:58 UTC (rev 3874)
@@ -14,17 +14,26 @@
 
 MASTER_SITES = http://pkg-config.freedesktop.org/releases/
 DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
-DISTFILES += $(call admfiles,CSWpkgconfig,depend)
+DISTFILES += fixme.sh
 
+PACKAGES = pkgconfig
+
+SPKG_SOURCEURL = http://pkg-config.freedesktop.org
+
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
 
 PATCHFILES = gsed-check.patch
 
-PREREQUISITE_PKGS = CSWggettext CSWglib2 CSWiconv CSWsunmath
+REQUIRED_PKGS = CSWggettextrt CSWglib2 CSWiconv CSWsunmath
 
 CONFIGURE_ARGS = $(DIRPATHS) --with-installed-glib
 
 TEST_TARGET = check
 
 include gar/category.mk
+
+post-configure-modulated:
+	@echo " ==> Fixing libtool .la-files"
+	@$(DOWNLOADDIR)/fixme.sh $(WORKSRC)
+	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/pkgconfig/trunk/checksums
===================================================================
--- csw/mgar/pkg/pkgconfig/trunk/checksums	2009-03-23 10:17:17 UTC (rev 3873)
+++ csw/mgar/pkg/pkgconfig/trunk/checksums	2009-03-23 14:55:58 UTC (rev 3874)
@@ -1,4 +1,3 @@
 d922a88782b64441d06547632fd85744  download/pkg-config-0.23.tar.gz
-3ffafaaed566a6e36c20bddc2cc000aa  download/CSWpkgconfig.gspec
-8333c926349d8e5366a5cfc8b2aca667  download/CSWpkgconfig.depend
+64d266fb8acf7df52088b9796f928b60  download/fixme.sh
 8d47301467b9f5932f56562585ebc068  download/gsed-check.patch

Deleted: csw/mgar/pkg/pkgconfig/trunk/files/CSWpkgconfig.depend
===================================================================
--- csw/mgar/pkg/pkgconfig/trunk/files/CSWpkgconfig.depend	2009-03-23 10:17:17 UTC (rev 3873)
+++ csw/mgar/pkg/pkgconfig/trunk/files/CSWpkgconfig.depend	2009-03-23 14:55:58 UTC (rev 3874)
@@ -1,4 +0,0 @@
-P CSWggettext ggettext - GNU gettext
-P CSWglib2    glib2 - the low-level core library for GTK+ and GNOME
-P CSWiconv    libiconv - GNU iconv library
-P CSWsunmath  libsunmath - Sun maths library

Deleted: csw/mgar/pkg/pkgconfig/trunk/files/CSWpkgconfig.gspec
===================================================================
--- csw/mgar/pkg/pkgconfig/trunk/files/CSWpkgconfig.gspec	2009-03-23 10:17:17 UTC (rev 3873)
+++ csw/mgar/pkg/pkgconfig/trunk/files/CSWpkgconfig.gspec	2009-03-23 14:55:58 UTC (rev 3874)
@@ -1,4 +0,0 @@
-%var            bitname pkgconfig
-%var            pkgname CSWpkgconfig
-%include        url file://%{PKGLIB}/csw_dyndepend.gspec
-%copyright      url file://%{WORKSRC}/COPYING

Copied: csw/mgar/pkg/pkgconfig/trunk/files/fixme.sh (from rev 3790, csw/mgar/pkg/fixme/trunk/fixme.sh)
===================================================================
--- csw/mgar/pkg/pkgconfig/trunk/files/fixme.sh	                        (rev 0)
+++ csw/mgar/pkg/pkgconfig/trunk/files/fixme.sh	2009-03-23 14:55:58 UTC (rev 3874)
@@ -0,0 +1,48 @@
+#!/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
+
+for LTMAIN in $(gfind ${BASEPATH} -name ltmain.sh -print); do
+    gsed "/for search_ext in .*\.la/s/\.la//" ${LTMAIN} >${LTMAIN}.new
+    gmv ${LTMAIN}.new ${LTMAIN}
+done
+


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