Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=21f48a5e6eef3319aca4b442e732214c607263fc

commit 21f48a5e6eef3319aca4b442e732214c607263fc
Author: Miklos Vajna <[EMAIL PROTECTED]>
Date:   Sat Aug 2 22:05:58 2008 +0200

pacman-g2-3.7.1-1-i686
- version bump
- removed patches

diff --git a/source/base/pacman-g2/FrugalBuild 
b/source/base/pacman-g2/FrugalBuild
index 0567366..cf92bfd 100644
--- a/source/base/pacman-g2/FrugalBuild
+++ b/source/base/pacman-g2/FrugalBuild
@@ -4,9 +4,9 @@
USE_DEVEL=${USE_DEVEL:-"n"}

pkgname=pacman-g2
-pkgver=3.7.0
+pkgver=3.7.1
Fuse $USE_DEVEL && pkgver=3.6.5.25.gf2bbdac
-pkgrel=4
+pkgrel=1
pkgdesc="A .tar.bz2 based package manager library (libpacman) and client 
(pacman-g2) with dependency support."
url="http://ftp.frugalware.org/pub/other/pacman-g2/";
backup=(etc/{makepkg,pacman-g2}.conf 
etc/pacman-g2/repos/{frugalware,frugalware-current})
@@ -20,9 +20,8 @@ archs=('i686' 'x86_64' 'ppc')
_F_archive_nosort=y
up2date="lynx -dump $url/releases/ |Flasttar"
if ! Fuse $USE_DEVEL; then
-       source=($url/releases/$pkgname-$pkgver.tar.gz \
-               generic-switch.patch glibc28-rename-index.patch 
glibc28-libftp-need-GNU_SOURCE.patch)
-       signatures=("$source.asc" '' '' '')
+       source=($url/releases/$pkgname-$pkgver.tar.gz)
+       signatures=("$source.asc")
else
_F_scm_type="git"
_F_scm_url="git://git.frugalware.org/pub/other/pacman-g2/pacman-g2"
@@ -40,7 +39,6 @@ build()
fi

CFLAGS=${CFLAGS/O2/O0}
-       unset MAKEFLAGS
Fcd
Fpatchall
Fautoreconf
diff --git a/source/base/pacman-g2/generic-switch.patch 
b/source/base/pacman-g2/generic-switch.patch
deleted file mode 100644
index 5972f40..0000000
--- a/source/base/pacman-g2/generic-switch.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index e594952..99d3d4e 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -101,10 +101,10 @@ case "$host" in
-               MARCHFLAG="march"
-               ;;
-       x86_64-*) AC_DEFINE_UNQUOTED([CARCH], ["x86_64"], [Architecture])
--              AC_DEFINE_UNQUOTED([CARCHFLAGS], ["k8"], [Architecture])
-+              AC_DEFINE_UNQUOTED([CARCHFLAGS], ["x86-64"], [Architecture])
-               AC_DEFINE_UNQUOTED([MARCHFLAG], ["march"], [Architecture])
-               CARCH="x86_64"
--              CARCHFLAGS="k8"
-+              CARCHFLAGS="x86-64"
-               MARCHFLAG="march"
-               ;;
-       ia64-*) AC_DEFINE_UNQUOTED([CARCH], ["ia64"], [Architecture])
-diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in
-index c2cbc5d..b7dad35 100644
---- a/etc/makepkg.conf.in
-+++ b/etc/makepkg.conf.in
-@@ -15,12 +15,10 @@ export CHOST="@CHOST@"
-
- # Pentium Pro/Pentium II/Pentium III+/Pentium 4/Athlon exclusive (binaries
- # will use the P6 instruction set and only run on P6+ systems)
--export CFLAGS="[EMAIL PROTECTED]@[EMAIL PROTECTED]@ -O2 -pipe"
--export CXXFLAGS="[EMAIL PROTECTED]@[EMAIL PROTECTED]@ -O2 -pipe"
--# Pentium Pro/Pentium II/Pentium III+/Pentium 4/Athlon optimized (but binaries
--# will run on any x86 system)
--#export CFLAGS="-mcpu=i686 -O2 -pipe"
--#export CXXFLAGS="-mcpu=i686 -O2 -pipe"
-+# As of GCC 4.2 -mtune=generic can be used to generate code running well on
-+# common x86 chips.
-+export CFLAGS="[EMAIL PROTECTED]@[EMAIL PROTECTED]@ -mtune=generic -O2 -pipe"
-+export CXXFLAGS="[EMAIL PROTECTED]@[EMAIL PROTECTED]@ -mtune=generic -O2 
-pipe"
-
- # SMP Systems
- #export MAKEFLAGS="-j2"
-diff --git a/scripts/makepkg b/scripts/makepkg
-index 6fefcae..7623725 100755
---- a/scripts/makepkg
-+++ b/scripts/makepkg
-@@ -124,13 +124,51 @@ if [ -e /etc/frugalware-release ] && $ECHO $CHOST|grep 
-q linux-gnu; then
- fi
-
- # we need -fno-strict-aliasing for gcc 4.2*++
-+_gccminver_generic="4.2"
- _gccver=`type -p gcc >/dev/null && gcc -dumpversion`
--if [ "${_gccver%%.?}" == "4.3" ]; then
-+if [[ "${_gccver%%.?}" == "${_gccminver_generic}" ]] || [[ "${_gccver%%.?}" > 
"${_gccminver_generic}" ]]; then
-         export CFLAGS="$CFLAGS -fno-strict-aliasing"
-         export CXXFLAGS="$CXXFLAGS -fno-strict-aliasing"
- fi
-
-
-+## another hack for syncpkgd almost , before 1.0 this should be removed
-+_glibcver_generic="2.8"
-+_glibcver=`ldd --version|head -n1 |sed 's/.*) //'`
-+if [ -e /etc/frugalware-release ]; then
-+      if [[ "${_glibcver} == ${_glibcver_generic}" ]] || [[ "${_glibcver}" > 
"${_glibcver_generic}" ]]; then
-+              if [ "$CARCH" == "i686" ]; then
-+                      if ! $ECHO ${CFLAGS}|grep -q "mtune=generic"; then
-+                              export CFLAGS="$CFLAGS -mtune=generic"
-+                      fi
-+                      if ! $ECHO ${CXXFLAGS}|grep -q "mtune=generic"; then
-+                              export CXXFLAGS="$CXXFLAGS -mtune=generic"
-+                      fi
-+              fi
-+
-+              if [ "$CARCH" == "x86_64" ]; then
-+                      ## so test for k8 since when is there this system 
doesn't uses x86-64 generic
-+                      if $ECHO ${CFLAGS}|grep -q "march=k8"; then
-+                              CFLAGS=${CFLAGS/-march=k8}
-+                              export CFLAGS="-march=x86-64 -mtune=generic 
$CFLAGS"
-+                      fi
-+                      if $ECHO ${CXXFLAGS}|grep -q "march=k8"; then
-+                              CXXFLAGS=${CXXFLAGS/-march=k8}
-+                              export CXXFLAGS="-march=x86-64 -mtune=generic 
$CXXFLAGS"
-+                      fi
-+              fi
-+      fi
-+fi
-+
-+## this has to stay here until we remove oldish gcc versions
-+if [[ "${_gccver%%.?}" < "${_gccminver_generic}" ]]; then
-+        # well we have gcc 3.3 and gcc 4.1 , these doesn't support 
-mtune=generic
-+        # so kill generic for these
-+        export CFLAGS="${CFLAGS/-mtune=generic}"
-+        export CXXFLAGS="${CXXFLAGS/-mtune=generic}"
-+fi
-+
-+
- INFAKEROOT=
- if [ "$1" = "-F" ]; then
-       INFAKEROOT=1
diff --git a/source/base/pacman-g2/glibc28-libftp-need-GNU_SOURCE.patch 
b/source/base/pacman-g2/glibc28-libftp-need-GNU_SOURCE.patch
deleted file mode 100644
index 84152b8..0000000
--- a/source/base/pacman-g2/glibc28-libftp-need-GNU_SOURCE.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff -Naur pacman-g2-3.7.0/lib/libftp/Makefile.am 
pacman-g2-3.7.0-glibc28/lib/libftp/Makefile.am
---- pacman-g2-3.7.0/lib/libftp/Makefile.am     2008-06-01 01:26:49.000000000 
+0200
-+++ pacman-g2-3.7.0-glibc28/lib/libftp/Makefile.am     2008-07-17 
18:05:16.000000000 +0200
-@@ -1,5 +1,5 @@
- AUTOMAKE_OPTIONS = gnu
--DEFINES = -DFTPLIB_DEFMODE=FTPLIB_PORT -D_REENTRANT
-+DEFINES = -DFTPLIB_DEFMODE=FTPLIB_PORT -D_REENTRANT -D_GNU_SOURCE
- AM_CFLAGS = $(DEFINES)
-
- #SOMAJOR = 3
diff --git a/source/base/pacman-g2/glibc28-rename-index.patch 
b/source/base/pacman-g2/glibc28-rename-index.patch
deleted file mode 100644
index 8546055..0000000
--- a/source/base/pacman-g2/glibc28-rename-index.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff -Naur pacman-g2-3.7.0/src/versort/versort.c 
pacman-g2-3.7.0-p/src/versort/versort.c
---- pacman-g2-3.7.0/src/versort/versort.c      2008-06-01 01:26:49.000000000 
+0200
-+++ pacman-g2-3.7.0-p/src/versort/versort.c    2008-07-17 14:00:02.000000000 
+0200
-@@ -47,7 +47,7 @@
- static size_t buffer_nmemb = 0;
- static size_t buffer_size = 0;
-
--static char **index = NULL;
-+static char **ver_index = NULL;
- static size_t index_nmemb = 0;
- static size_t index_size = 0;
-
-@@ -102,15 +102,15 @@
-               {
-                       if (tmp_index == index_size) {
-                               index_size += BUFFER_CHUNK;
--                              index = realloc(index, index_size * sizeof(char 
*));
--                              if (!index)
-+                              ver_index = realloc(ver_index, index_size * 
sizeof(char *));
-+                              if (!ver_index)
-                                       exit(EXIT_FAILURE);
-                       }
-
-                       switch (status)
-                       {
-                       case STATUS_MARK: // Mark a new buffer
--                              index[index_nmemb] = &buffer[tmp_index];
-+                              ver_index[index_nmemb] = &buffer[tmp_index];
-                               ++index_nmemb;
-                               status = STATUS_SEARCH;
-                               break;
-@@ -136,7 +136,7 @@
-       size_t i;
-
-       for (i = 0; i < index_nmemb; i++)
--              puts(index[i]);
-+              puts(ver_index[i]);
- }
-
- static int vercmpp(const void *p1, const void *p2)
-@@ -167,11 +167,11 @@
-
-       makeindex();
-
--      qsort(index, index_nmemb, sizeof(char *), vercmpp);
-+      qsort(ver_index, index_nmemb, sizeof(char *), vercmpp);
-
-       printindex();
-
--      free(index);
-+      free(ver_index);
-       free(buffer);
-
-       exit(EXIT_SUCCESS);
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to