[csw-devel] SF.net SVN: gar:[11293] csw/mgar/pkg/pkgconfig/trunk
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Wed Oct 13 20:34:17 CEST 2010
Revision: 11293
http://gar.svn.sourceforge.net/gar/?rev=11293&view=rev
Author: dmichelsen
Date: 2010-10-13 18:34:17 +0000 (Wed, 13 Oct 2010)
Log Message:
-----------
pkgconfig: Update to 0.25 and several testsuite fixes for Solaris
Modified Paths:
--------------
csw/mgar/pkg/pkgconfig/trunk/Makefile
csw/mgar/pkg/pkgconfig/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/pkgconfig/trunk/files/0001-Ugly-shell-fixes-and-force-gnome-config-to-be-there.patch
Removed Paths:
-------------
csw/mgar/pkg/pkgconfig/trunk/files/fixme.sh
csw/mgar/pkg/pkgconfig/trunk/files/gsed-check.patch
Modified: csw/mgar/pkg/pkgconfig/trunk/Makefile
===================================================================
--- csw/mgar/pkg/pkgconfig/trunk/Makefile 2010-10-13 17:29:40 UTC (rev 11292)
+++ csw/mgar/pkg/pkgconfig/trunk/Makefile 2010-10-13 18:34:17 UTC (rev 11293)
@@ -1,5 +1,5 @@
GARNAME = pkg-config
-GARVERSION = 0.23
+GARVERSION = 0.25
CATEGORIES = devel
DESCRIPTION = Tool for determining the configuration of installed software
@@ -14,27 +14,24 @@
MASTER_SITES = http://pkg-config.freedesktop.org/releases/
DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
-DISTFILES += fixme.sh
PACKAGES = CSWpkgconfig
+CATALOGNAME = 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
-PATCHFILES += manpage-macro.patch
+PATCHFILES = manpage-macro.patch
+PATCHFILES += 0001-Ugly-shell-fixes-and-force-gnome-config-to-be-there.patch
-RUNTIME_DEP_PKGS = CSWggettextrt CSWglib2
+DEP_PKGS = CSWggettextrt CSWglib2
-CONFIGURE_ARGS = $(DIRPATHS) --with-installed-glib
+CONFIGURE_ARGS = $(DIRPATHS)
+CONFIGURE_ARGS += --docdir=$(docdir)/$(CATALOGNAME)
+CONFIGURE_ARGS += --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 2010-10-13 17:29:40 UTC (rev 11292)
+++ csw/mgar/pkg/pkgconfig/trunk/checksums 2010-10-13 18:34:17 UTC (rev 11293)
@@ -1,4 +1,3 @@
-64d266fb8acf7df52088b9796f928b60 download/fixme.sh
-8d47301467b9f5932f56562585ebc068 download/gsed-check.patch
-73a8bc0d5ab5236dcb183460bc0311e4 download/manpage-macro.patch
-d922a88782b64441d06547632fd85744 download/pkg-config-0.23.tar.gz
+8d47301467b9f5932f56562585ebc068 gsed-check.patch
+73a8bc0d5ab5236dcb183460bc0311e4 manpage-macro.patch
+a3270bab3f4b69b7dc6dbdacbcae9745 pkg-config-0.25.tar.gz
Added: csw/mgar/pkg/pkgconfig/trunk/files/0001-Ugly-shell-fixes-and-force-gnome-config-to-be-there.patch
===================================================================
--- csw/mgar/pkg/pkgconfig/trunk/files/0001-Ugly-shell-fixes-and-force-gnome-config-to-be-there.patch (rev 0)
+++ csw/mgar/pkg/pkgconfig/trunk/files/0001-Ugly-shell-fixes-and-force-gnome-config-to-be-there.patch 2010-10-13 18:34:17 UTC (rev 11293)
@@ -0,0 +1,175 @@
+From 070eb10bb70272feecaacd7d4e875bc241751d0a Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Wed, 13 Oct 2010 20:11:40 +0200
+Subject: [PATCH 3/3] Ugly shell fixes and force gnome-config to be there
+
+---
+ check/check-cflags | 2 +-
+ check/check-conflicts | 2 +-
+ check/check-define-variable | 2 +-
+ check/check-idirafter | 2 +-
+ check/check-includedir | 2 +-
+ check/check-libs | 2 +-
+ check/check-libs-private | 2 +-
+ check/check-missing | 2 +-
+ check/check-requires-private | 2 +-
+ check/check-whitespace | 2 +-
+ check/common | 2 +-
+ check/gnome-config | 1 +
+ 12 files changed, 12 insertions(+), 11 deletions(-)
+ create mode 120000 check/gnome-config
+
+diff --git a/check/check-cflags b/check/check-cflags
+index eb2d6bc..8c89731 100755
+--- a/check/check-cflags
++++ b/check/check-cflags
+@@ -2,7 +2,7 @@
+
+ # Make sure we're POSIX
+ if [ "$PKG_CONFIG_SHELL_IS_POSIX" != "1" ]; then
+- PKG_CONFIG_SHELL_IS_POSIX=1 PATH=`getconf PATH` exec sh $0 "$@"
++ PKG_CONFIG_SHELL_IS_POSIX=1 PATH=`getconf PATH`:`pwd` exec bash $0 "$@"
+ fi
+
+ set -e
+diff --git a/check/check-conflicts b/check/check-conflicts
+index 8092ba9..9b6d378 100755
+--- a/check/check-conflicts
++++ b/check/check-conflicts
+@@ -2,7 +2,7 @@
+
+ # Make sure we're POSIX
+ if [ "$PKG_CONFIG_SHELL_IS_POSIX" != "1" ]; then
+- PKG_CONFIG_SHELL_IS_POSIX=1 PATH=`getconf PATH` exec sh $0 "$@"
++ PKG_CONFIG_SHELL_IS_POSIX=1 PATH=`getconf PATH`:`pwd` exec bash $0 "$@"
+ fi
+
+ set -e
+diff --git a/check/check-define-variable b/check/check-define-variable
+index bf8aebe..60f651e 100755
+--- a/check/check-define-variable
++++ b/check/check-define-variable
+@@ -2,7 +2,7 @@
+
+ # Make sure we're POSIX
+ if [ "$PKG_CONFIG_SHELL_IS_POSIX" != "1" ]; then
+- PKG_CONFIG_SHELL_IS_POSIX=1 PATH=`getconf PATH` exec sh $0 "$@"
++ PKG_CONFIG_SHELL_IS_POSIX=1 PATH=`getconf PATH`:`pwd` exec bash $0 "$@"
+ fi
+
+ set -e
+diff --git a/check/check-idirafter b/check/check-idirafter
+index 7abd2dc..b4f9446 100755
+--- a/check/check-idirafter
++++ b/check/check-idirafter
+@@ -2,7 +2,7 @@
+
+ # Make sure we're POSIX
+ if [ "$PKG_CONFIG_SHELL_IS_POSIX" != "1" ]; then
+- PKG_CONFIG_SHELL_IS_POSIX=1 PATH=`getconf PATH` exec sh $0 "$@"
++ PKG_CONFIG_SHELL_IS_POSIX=1 PATH=`getconf PATH`:`pwd` exec bash $0 "$@"
+ fi
+
+ set -e
+diff --git a/check/check-includedir b/check/check-includedir
+index d78ec24..98b8682 100755
+--- a/check/check-includedir
++++ b/check/check-includedir
+@@ -2,7 +2,7 @@
+
+ # Make sure we're POSIX
+ if [ "$PKG_CONFIG_SHELL_IS_POSIX" != "1" ]; then
+- PKG_CONFIG_SHELL_IS_POSIX=1 PATH=`getconf PATH` exec sh $0 "$@"
++ PKG_CONFIG_SHELL_IS_POSIX=1 PATH=`getconf PATH`:`pwd` exec bash $0 "$@"
+ fi
+
+ set -e
+diff --git a/check/check-libs b/check/check-libs
+index 9b1b495..dfef4cc 100755
+--- a/check/check-libs
++++ b/check/check-libs
+@@ -2,7 +2,7 @@
+
+ # Make sure we're POSIX
+ if [ "$PKG_CONFIG_SHELL_IS_POSIX" != "1" ]; then
+- PKG_CONFIG_SHELL_IS_POSIX=1 PATH=`getconf PATH` exec sh $0 "$@"
++ PKG_CONFIG_SHELL_IS_POSIX=1 PATH=`getconf PATH`:`pwd` exec bash $0 "$@"
+ fi
+
+ set -e
+diff --git a/check/check-libs-private b/check/check-libs-private
+index 961962b..5f79fba 100755
+--- a/check/check-libs-private
++++ b/check/check-libs-private
+@@ -2,7 +2,7 @@
+
+ # Make sure we're POSIX
+ if [ "$PKG_CONFIG_SHELL_IS_POSIX" != "1" ]; then
+- PKG_CONFIG_SHELL_IS_POSIX=1 PATH=`getconf PATH` exec sh $0 "$@"
++ PKG_CONFIG_SHELL_IS_POSIX=1 PATH=`getconf PATH`:`pwd` exec bash $0 "$@"
+ fi
+
+ set -e
+diff --git a/check/check-missing b/check/check-missing
+index fba43a7..300519b 100755
+--- a/check/check-missing
++++ b/check/check-missing
+@@ -2,7 +2,7 @@
+
+ # Make sure we're POSIX
+ if [ "$PKG_CONFIG_SHELL_IS_POSIX" != "1" ]; then
+- PKG_CONFIG_SHELL_IS_POSIX=1 PATH=`getconf PATH` exec sh $0 "$@"
++ PKG_CONFIG_SHELL_IS_POSIX=1 PATH=`getconf PATH`:`pwd` exec bash $0 "$@"
+ fi
+
+ . ${srcdir}/common
+diff --git a/check/check-requires-private b/check/check-requires-private
+index 45115ee..4803097 100755
+--- a/check/check-requires-private
++++ b/check/check-requires-private
+@@ -2,7 +2,7 @@
+
+ # Make sure we're POSIX
+ if [ "$PKG_CONFIG_SHELL_IS_POSIX" != "1" ]; then
+- PKG_CONFIG_SHELL_IS_POSIX=1 PATH=`getconf PATH` exec sh $0 "$@"
++ PKG_CONFIG_SHELL_IS_POSIX=1 PATH=`getconf PATH`:`pwd` exec bash $0 "$@"
+ fi
+ set -e
+
+diff --git a/check/check-whitespace b/check/check-whitespace
+index 31a413c..607cacf 100755
+--- a/check/check-whitespace
++++ b/check/check-whitespace
+@@ -2,7 +2,7 @@
+
+ # Make sure we're POSIX
+ if [ "$PKG_CONFIG_SHELL_IS_POSIX" != "1" ]; then
+- PKG_CONFIG_SHELL_IS_POSIX=1 PATH=`getconf PATH` exec sh $0 "$@"
++ PKG_CONFIG_SHELL_IS_POSIX=1 PATH=`getconf PATH`:`pwd` exec bash $0 "$@"
+ fi
+
+ set -e
+diff --git a/check/common b/check/common
+index 57aa806..ef96b68 100644
+--- a/check/common
++++ b/check/common
+@@ -22,7 +22,7 @@ run_test () {
+ exit 1
+ fi
+
+- R=$(${pkgconfig} $ARGS 2>&1 | sed -e 's,^[[:space:]]*,,' -e 's,[[:space:]]*$,,')
++ R=$(${pkgconfig} $ARGS 2>&1 | /opt/csw/bin/gsed -e 's,^[[:space:]]*,,' -e 's,[[:space:]]*$,,')
+ if [ "$R" != "$RESULT" ]; then
+ echo "${pkgconfig} $ARGS :"
+ echo "'$R' != '$RESULT'"
+diff --git a/check/gnome-config b/check/gnome-config
+new file mode 120000
+index 0000000..7d77455
+--- /dev/null
++++ b/check/gnome-config
+@@ -0,0 +1 @@
++/usr/bin/true
+\ No newline at end of file
+--
+1.7.3
+
Deleted: csw/mgar/pkg/pkgconfig/trunk/files/fixme.sh
===================================================================
--- csw/mgar/pkg/pkgconfig/trunk/files/fixme.sh 2010-10-13 17:29:40 UTC (rev 11292)
+++ csw/mgar/pkg/pkgconfig/trunk/files/fixme.sh 2010-10-13 18:34:17 UTC (rev 11293)
@@ -1,48 +0,0 @@
-#!/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
-
Deleted: csw/mgar/pkg/pkgconfig/trunk/files/gsed-check.patch
===================================================================
--- csw/mgar/pkg/pkgconfig/trunk/files/gsed-check.patch 2010-10-13 17:29:40 UTC (rev 11292)
+++ csw/mgar/pkg/pkgconfig/trunk/files/gsed-check.patch 2010-10-13 18:34:17 UTC (rev 11293)
@@ -1,12 +0,0 @@
-diff --speed-large-files --minimal -Nru pkg-config-0.23.orig/check/common pkg-config-0.23/check/common
---- pkg-config-0.23.orig/check/common 2008-01-16 21:42:49.000000000 +0100
-+++ pkg-config-0.23/check/common 2008-02-04 06:32:58.994364000 +0100
-@@ -16,7 +16,7 @@
- exit 1
- fi
-
-- R=$(${pkgconfig} $ARGS | sed -e 's,^[[:space:]]*,,' -e 's,[[:space:]]*$,,')
-+ R=$(${pkgconfig} $ARGS | /opt/csw/bin/gsed -e 's,^[[:space:]]*,,' -e 's,[[:space:]]*$,,')
- if [ "$R" != "$RESULT" ]; then
- echo "${pkgconfig} $ARGS :"
- echo "'$R' != '$RESULT'"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list