summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorge Sherwood2011-08-07 17:59:37 -0500
committerGeorge Sherwood2011-08-07 17:59:37 -0500
commit145b62be796163090d82a42e536509162bc5d04f (patch)
treee2ebe078e7126963dcbec513972b33ab8829fb6b
parent1ee989f45c95082b64730566f9281bea1d87d542 (diff)
Revert "pkgconfig: added version 0.25 for fresh install / without glib2"
Failing for me in stable-rc. Need to understand better This reverts commit bbc81239fb0611a5a3b1ef313e7439928a653460.
-rwxr-xr-xdevel/pkgconfig/DEPENDS4
-rwxr-xr-xdevel/pkgconfig/DETAILS7
-rw-r--r--devel/pkgconfig/HISTORY3
3 files changed, 1 insertions, 13 deletions
diff --git a/devel/pkgconfig/DEPENDS b/devel/pkgconfig/DEPENDS
index 329e0ab9b0..150d45af3a 100755
--- a/devel/pkgconfig/DEPENDS
+++ b/devel/pkgconfig/DEPENDS
@@ -1,3 +1 @@
-if [[ "$VERSION" != "0.25" ]]; then
- depends glib2
-fi
+depends glib2
diff --git a/devel/pkgconfig/DETAILS b/devel/pkgconfig/DETAILS
index a2a73fc8af..ef95a6184e 100755
--- a/devel/pkgconfig/DETAILS
+++ b/devel/pkgconfig/DETAILS
@@ -1,13 +1,6 @@
SPELL=pkgconfig
-
-if spell_ok glib2; then
VERSION=0.26
SOURCE_HASH=sha512:9390d5918dd4ac520b914d2330aa7cae2587ca7b21b03bc88372fd5dbbd78e33eeb3fca39fcdb6dd10113658f03118a1c8829149c7029eb0dd80348d100170a4
- else
- VERSION=0.25
- SOURCE_HASH=sha512:6c50ca542733feeb10301097ade32075c5417ada5bdd195957de8521a28b20e0e7a54ed553fa3e022b24969e9deb97d72e289192cb2a3afc2c86241dc6cafa02
-fi
-
SOURCE=pkg-config-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/pkg-config-$VERSION
SOURCE_URL[0]=http://www.freedesktop.org/software/$SPELL/releases/$SOURCE
diff --git a/devel/pkgconfig/HISTORY b/devel/pkgconfig/HISTORY
index 13bb57595e..7fbfa21851 100644
--- a/devel/pkgconfig/HISTORY
+++ b/devel/pkgconfig/HISTORY
@@ -1,6 +1,3 @@
-2011-08-02 Ladislav Hagara <hgr@vabo.cz>
- * DETAILS, DEPENDS: added version 0.25 for fresh install / without glib2
-
2011-08-01 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 0.26
* DEPENDS: embedded glib has been removed, depends on glib2 now