[arch-commits] Commit in swt/trunk (PKGBUILD)

2011-09-26 Thread Guillaume Alaux
Date: Monday, September 26, 2011 @ 03:59:11
  Author: guillaume
Revision: 138505

upgpkg: swt 3.7.1-1

Upstream release

Modified:
  swt/trunk/PKGBUILD

--+
 PKGBUILD |   14 --
 1 file changed, 4 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-09-25 17:23:16 UTC (rev 138504)
+++ PKGBUILD2011-09-26 07:59:11 UTC (rev 138505)
@@ -1,10 +1,10 @@
 # $Id$
 # Maintainer: Guillaume ALAUX guilla...@archlinux.org
 pkgname=swt
-pkgver=3.7
+pkgver=3.7.1
 pkgrel=1
 pkgdesc=An open source widget toolkit for Java
-_date=201106131736
+_date=201109091335
 arch=(i686 x86_64)
 url=http://www.eclipse.org/swt/;
 license=('EPL')
@@ -13,23 +13,17 @@
 #makedepends=('openjdk6' 'libxtst' 'mesa' 'libgnomeui' 'xulrunner=1.9.1' 
'unzip' 'pkgconfig' 'apache-ant')
 optdepends=('libgnomeui' 'mesa')
 makedepends=('openjdk6' 'libxtst' 'mesa' 'libgnomeui' 'unzip' 'pkgconfig' 
'apache-ant')
-source=(http://download.eclipse.org/eclipse/downloads/drops/R-${pkgver}-${_date}/swt-${pkgver}-gtk-linux-x86.zip
-
http://download.eclipse.org/eclipse/downloads/drops/R-${pkgver}-${_date}/swt-${pkgver}-gtk-linux-x86_64.zip
-build-swt.xml)
-md5sums=('21d084526f5df4e02900b2ce4ae8b5d1'
- '60f11408bc8db299c5406a904a665a5e'
- 'f5e548bc26a0f1f3c18131be76face40')
 if [ ${CARCH} = i686 ]; then
   
source=(http://download.eclipse.org/eclipse/downloads/drops/R-${pkgver}-${_date}/swt-${pkgver}-gtk-linux-x86.zip
   build-swt.xml)
   noextract=(swt-${pkgver}-gtk-linux-x86.zip)
-  md5sums=('21d084526f5df4e02900b2ce4ae8b5d1'
+  md5sums=('b7d6d24e2feb7489b0baa0ce941ea4d2'
'f5e548bc26a0f1f3c18131be76face40')
 fi
 if [ ${CARCH} = x86_64 ]; then
   
source=(http://download.eclipse.org/eclipse/downloads/drops/R-${pkgver}-${_date}/swt-${pkgver}-gtk-linux-x86_64.zip
   build-swt.xml)
-  md5sums=('60f11408bc8db299c5406a904a665a5e'
+  md5sums=('8816631e7993a783a87e98ba39da7fa6'
'f5e548bc26a0f1f3c18131be76face40')
   noextract=(swt-${pkgver}-gtk-linux-x86_64.zip)
 fi



[arch-commits] Commit in swt/repos (8 files)

2011-09-26 Thread Guillaume Alaux
Date: Monday, September 26, 2011 @ 04:00:12
  Author: guillaume
Revision: 138506

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  swt/repos/extra-i686/PKGBUILD
(from rev 138505, swt/trunk/PKGBUILD)
  swt/repos/extra-i686/build-swt.xml
(from rev 138505, swt/trunk/build-swt.xml)
  swt/repos/extra-x86_64/PKGBUILD
(from rev 138505, swt/trunk/PKGBUILD)
  swt/repos/extra-x86_64/build-swt.xml
(from rev 138505, swt/trunk/build-swt.xml)
Deleted:
  swt/repos/extra-i686/PKGBUILD
  swt/repos/extra-i686/build-swt.xml
  swt/repos/extra-x86_64/PKGBUILD
  swt/repos/extra-x86_64/build-swt.xml

+
 extra-i686/PKGBUILD|  156 ---
 extra-i686/build-swt.xml   |   34 -
 extra-x86_64/PKGBUILD  |  156 ---
 extra-x86_64/build-swt.xml |   34 -
 4 files changed, 184 insertions(+), 196 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2011-09-26 07:59:11 UTC (rev 138505)
+++ extra-i686/PKGBUILD 2011-09-26 08:00:12 UTC (rev 138506)
@@ -1,81 +0,0 @@
-# $Id$
-# Maintainer: Guillaume ALAUX guilla...@archlinux.org
-pkgname=swt
-pkgver=3.7
-pkgrel=1
-pkgdesc=An open source widget toolkit for Java
-_date=201106131736
-arch=(i686 x86_64)
-url=http://www.eclipse.org/swt/;
-license=('EPL')
-depends=('java-runtime=6' 'gtk2=2.20.1' 'libxtst')
-#optdepends=('libgnomeui' 'xulrunner' 'mesa')
-#makedepends=('openjdk6' 'libxtst' 'mesa' 'libgnomeui' 'xulrunner=1.9.1' 
'unzip' 'pkgconfig' 'apache-ant')
-optdepends=('libgnomeui' 'mesa')
-makedepends=('openjdk6' 'libxtst' 'mesa' 'libgnomeui' 'unzip' 'pkgconfig' 
'apache-ant')
-source=(http://download.eclipse.org/eclipse/downloads/drops/R-${pkgver}-${_date}/swt-${pkgver}-gtk-linux-x86.zip
-
http://download.eclipse.org/eclipse/downloads/drops/R-${pkgver}-${_date}/swt-${pkgver}-gtk-linux-x86_64.zip
-build-swt.xml)
-md5sums=('21d084526f5df4e02900b2ce4ae8b5d1'
- '60f11408bc8db299c5406a904a665a5e'
- 'f5e548bc26a0f1f3c18131be76face40')
-if [ ${CARCH} = i686 ]; then
-  
source=(http://download.eclipse.org/eclipse/downloads/drops/R-${pkgver}-${_date}/swt-${pkgver}-gtk-linux-x86.zip
-  build-swt.xml)
-  noextract=(swt-${pkgver}-gtk-linux-x86.zip)
-  md5sums=('21d084526f5df4e02900b2ce4ae8b5d1'
-   'f5e548bc26a0f1f3c18131be76face40')
-fi
-if [ ${CARCH} = x86_64 ]; then
-  
source=(http://download.eclipse.org/eclipse/downloads/drops/R-${pkgver}-${_date}/swt-${pkgver}-gtk-linux-x86_64.zip
-  build-swt.xml)
-  md5sums=('60f11408bc8db299c5406a904a665a5e'
-   'f5e548bc26a0f1f3c18131be76face40')
-  noextract=(swt-${pkgver}-gtk-linux-x86_64.zip)
-fi
-
-build() {
-  cd ${srcdir}
-  . /etc/profile.d/openjdk6.sh
-  . /etc/profile.d/apache-ant.sh
-  unzip -jqo ${srcdir}/swt-${pkgver}-gtk-linux-*.zip *src.zip
-  unzip -qo src.zip
-  rm -rf about_files
-  mkdir src
-  mv org src/
-  cp build-swt.xml build.xml
-
-  [ ${CARCH} = x86_64 ]  export SWT_PTR_CFLAGS=-DJNI64
-
-  make -f make_linux.mak make_awt
-  make -f make_linux.mak make_swt
-  make -f make_linux.mak make_atk
-  make -f make_linux.mak make_gnome
-# XULRunner = 2.0 is not currently supported
-#   https://bugs.eclipse.org/bugs/show_bug.cgi?id=327696
-#
-#  export MOZILLA_INCLUDES=`pkg-config --cflags libxul`
-#  export MOZILLA_LIBS=-Wl,-R`pkg-config libxul --variable=libdir` 
`pkg-config libxul --libs`
-#  export XULRUNNER_INCLUDES=${MOZILLA_INCLUDES}
-#  export XULRUNNER_LIBS=${MOZILLA_LIBS}
-#  make -f make_linux.mak make_mozilla
-#  make -f make_linux.mak make_xulrunner
-
-  make -f make_linux.mak make_cairo
-  make -f make_linux.mak make_glx
- 
-  ant compile
-}
-
-package() {
-  cd ${srcdir}
-  cp version.txt build/version.txt
-  cp src/org/eclipse/swt/internal/SWTMessages.properties 
build/org/eclipse/swt/internal/
-
-  ant jar
-
-  install -m755 -d ${pkgdir}/usr/share/java
-  install -m755 -d ${pkgdir}/usr/lib
-  install -m644 swt.jar ${pkgdir}/usr/share/java/
-  install -m755 *.so ${pkgdir}/usr/lib/
-}

Copied: swt/repos/extra-i686/PKGBUILD (from rev 138505, swt/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2011-09-26 08:00:12 UTC (rev 138506)
@@ -0,0 +1,75 @@
+# $Id$
+# Maintainer: Guillaume ALAUX guilla...@archlinux.org
+pkgname=swt
+pkgver=3.7.1
+pkgrel=1
+pkgdesc=An open source widget toolkit for Java
+_date=201109091335
+arch=(i686 x86_64)
+url=http://www.eclipse.org/swt/;
+license=('EPL')
+depends=('java-runtime=6' 'gtk2=2.20.1' 'libxtst')
+#optdepends=('libgnomeui' 'xulrunner' 'mesa')
+#makedepends=('openjdk6' 'libxtst' 'mesa' 'libgnomeui' 'xulrunner=1.9.1' 
'unzip' 'pkgconfig' 'apache-ant')
+optdepends=('libgnomeui' 'mesa')
+makedepends=('openjdk6' 'libxtst' 'mesa' 'libgnomeui' 'unzip' 'pkgconfig' 
'apache-ant')
+if [ 

[arch-commits] Commit in tomcat/trunk (PKGBUILD tomcat.install)

2011-09-26 Thread Guillaume Alaux
Date: Monday, September 26, 2011 @ 08:18:42
  Author: guillaume
Revision: 138507

upgpkg: tomcat 5.5.34-1

Upstream release

Modified:
  tomcat/trunk/PKGBUILD
  tomcat/trunk/tomcat.install

+
 PKGBUILD   |   10 +-
 tomcat.install |9 +
 2 files changed, 14 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-09-26 08:00:12 UTC (rev 138506)
+++ PKGBUILD2011-09-26 12:18:42 UTC (rev 138507)
@@ -2,7 +2,7 @@
 # Maintainer: Guillaume ALAUX guillaume at archlinux dot org
 # Contributor: Hugo Doria h...@archlinux.org
 pkgname=tomcat
-pkgver=5.5.33
+pkgver=5.5.34
 pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc=Servlet-2.4/JSP-2.0 Container
@@ -15,7 +15,7 @@
 
source=(http://archive.apache.org/dist/tomcat/tomcat-5/v${pkgver}/bin/apache-tomcat-${pkgver}.tar.gz
'tomcat'
'tomcat.conf.d')
-md5sums=('3d79cd245497b2c501b4fd64e1da641c'
+md5sums=('d09a09bc84409510574a673d35939f16'
  '20e6a8e89a148e2b0ac81ca03ceea6b1'
  '368322d8a51ce20cc5dbdb505706a16a')
 
@@ -24,7 +24,7 @@
   # build jsvc
   cd ${srcdir}/apache-${pkgname}-${pkgver}/bin
   tar xzf commons-daemon-native.tar.gz
-  cd commons-daemon-1.0.5-native-src/unix
+  cd commons-daemon-1.0.7-native-src/unix
   sh configure --with-java=/usr/lib/jvm/java-6-openjdk
   make clean
   make
@@ -43,7 +43,7 @@
   cp -R * ${pkgdir}/opt/tomcat
   install -D -m755 ${srcdir}/tomcat ${pkgdir}/etc/rc.d/tomcat
   install -D -m644 ${srcdir}/tomcat.conf.d ${pkgdir}/etc/conf.d/tomcat
-  chgrp -R 66 ${pkgdir}/opt/tomcat/{conf,work,webapps}
+  chgrp -R 66 ${pkgdir}/opt/tomcat/{conf,work,webapps,logs}
   chmod 0660 
${pkgdir}/opt/tomcat/conf/{*.xml,*.policy,*.properties,/Catalina/localhost/*.xml}
-  chmod 775 ${pkgdir}/opt/tomcat/{conf,work,webapps}
+  chmod 775 ${pkgdir}/opt/tomcat/{conf,work,webapps,logs}
 }

Modified: tomcat.install
===
--- tomcat.install  2011-09-26 08:00:12 UTC (rev 138506)
+++ tomcat.install  2011-09-26 12:18:42 UTC (rev 138507)
@@ -11,6 +11,15 @@
 echo  Also, you should add it to your MODULES array in rc.conf, so
 echo  it will be activated automatically at boot-up.
   fi
+
+  echo 
+  echo == End of life for Apache Tomcat 5.5.x ==
+  echo The Apache Tomcat team announces that support for Apache Tomcat 5.5.x
+  echo will end on 30 September 2012.
+  echo 
+  echo You are thus strongly encouraged to migrate to tomcat6 or tomcat7
+  echo 
+  echo See the Arch Linux wiki page for tomcat for more information.
 }
 
 post_upgrade() {



[arch-commits] Commit in tomcat/repos (16 files)

2011-09-26 Thread Guillaume Alaux
Date: Monday, September 26, 2011 @ 08:20:21
  Author: guillaume
Revision: 138508

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  tomcat/repos/extra-i686/PKGBUILD
(from rev 138507, tomcat/trunk/PKGBUILD)
  tomcat/repos/extra-i686/tomcat
(from rev 138507, tomcat/trunk/tomcat)
  tomcat/repos/extra-i686/tomcat.conf.d
(from rev 138507, tomcat/trunk/tomcat.conf.d)
  tomcat/repos/extra-i686/tomcat.install
(from rev 138507, tomcat/trunk/tomcat.install)
  tomcat/repos/extra-x86_64/PKGBUILD
(from rev 138507, tomcat/trunk/PKGBUILD)
  tomcat/repos/extra-x86_64/tomcat
(from rev 138507, tomcat/trunk/tomcat)
  tomcat/repos/extra-x86_64/tomcat.conf.d
(from rev 138507, tomcat/trunk/tomcat.conf.d)
  tomcat/repos/extra-x86_64/tomcat.install
(from rev 138507, tomcat/trunk/tomcat.install)
Deleted:
  tomcat/repos/extra-i686/PKGBUILD
  tomcat/repos/extra-i686/tomcat
  tomcat/repos/extra-i686/tomcat.conf.d
  tomcat/repos/extra-i686/tomcat.install
  tomcat/repos/extra-x86_64/PKGBUILD
  tomcat/repos/extra-x86_64/tomcat
  tomcat/repos/extra-x86_64/tomcat.conf.d
  tomcat/repos/extra-x86_64/tomcat.install

-+
 extra-i686/PKGBUILD |   95 +++--
 extra-i686/tomcat   |  106 +-
 extra-i686/tomcat.conf.d|   10 +--
 extra-i686/tomcat.install   |   63 ++--
 extra-x86_64/PKGBUILD   |   95 +++--
 extra-x86_64/tomcat |  106 +-
 extra-x86_64/tomcat.conf.d  |   10 +--
 extra-x86_64/tomcat.install |   63 ++--
 8 files changed, 286 insertions(+), 262 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2011-09-26 12:18:42 UTC (rev 138507)
+++ extra-i686/PKGBUILD 2011-09-26 12:20:21 UTC (rev 138508)
@@ -1,46 +0,0 @@
-# $Id$
-# Maintainer: Guillaume ALAUX guillaume at archlinux dot org
-# Contributor: Hugo Doria h...@archlinux.org
-pkgname=tomcat
-pkgver=5.5.33
-pkgrel=1
-arch=('i686' 'x86_64')
-pkgdesc=Servlet container for Java Servlet and JavaServer Pages
-url=http://tomcat.apache.org/;
-license=('APACHE')
-depends=('java-environment')
-makedepends=('openjdk6')
-backup=('opt/tomcat/conf/server.xml' 'opt/tomcat/conf/tomcat-users.xml' 
'etc/conf.d/tomcat')
-install=tomcat.install
-source=(http://archive.apache.org/dist/tomcat/tomcat-5/v${pkgver}/bin/apache-tomcat-${pkgver}.tar.gz
-   'tomcat'
-   'tomcat.conf.d')
-md5sums=('3d79cd245497b2c501b4fd64e1da641c'
- '20e6a8e89a148e2b0ac81ca03ceea6b1'
- '368322d8a51ce20cc5dbdb505706a16a')
-
-build() {
-  unset LDFLAGS
-  # build jsvc
-  cd ${srcdir}/apache-${pkgname}-${pkgver}/bin
-  tar xzf commons-daemon-native.tar.gz
-  cd commons-daemon-1.0.5-native-src/unix
-  sh configure --with-java=/usr/lib/jvm/java-6-openjdk
-  make clean
-  make
-  cp jsvc ../..
-
-  # get rid of some cruft
-  cd ${srcdir}/apache-${pkgname}-${pkgver}
-  rm -f LICENSE NOTICE RELEASE-NOTES RUNNING.txt
-  rm -fr bin/*.exe bin/*.bat bin/*.tar.gz bin/jsvc-src
-
-  # install everything
-  mkdir -p ${pkgdir}/opt/tomcat
-  cp -R * ${pkgdir}/opt/tomcat
-  install -D -m755 ${srcdir}/tomcat ${pkgdir}/etc/rc.d/tomcat
-  install -D -m644 ${srcdir}/tomcat.conf.d ${pkgdir}/etc/conf.d/tomcat
-  chgrp -R 66 ${pkgdir}/opt/tomcat/{conf,work,webapps}
-  chmod 0660 
${pkgdir}/opt/tomcat/conf/{*.xml,*.policy,*.properties,/Catalina/localhost/*.xml}
-  chmod 775 ${pkgdir}/opt/tomcat/{conf,work,webapps}
-}

Copied: tomcat/repos/extra-i686/PKGBUILD (from rev 138507, 
tomcat/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2011-09-26 12:20:21 UTC (rev 138508)
@@ -0,0 +1,49 @@
+# $Id$
+# Maintainer: Guillaume ALAUX guillaume at archlinux dot org
+# Contributor: Hugo Doria h...@archlinux.org
+pkgname=tomcat
+pkgver=5.5.34
+pkgrel=1
+arch=('i686' 'x86_64')
+pkgdesc=Servlet-2.4/JSP-2.0 Container
+url=http://tomcat.apache.org/;
+license=('APACHE')
+depends=('java-environment')
+makedepends=('openjdk6')
+backup=('opt/tomcat/conf/server.xml' 'opt/tomcat/conf/tomcat-users.xml' 
'etc/conf.d/tomcat')
+install=tomcat.install
+source=(http://archive.apache.org/dist/tomcat/tomcat-5/v${pkgver}/bin/apache-tomcat-${pkgver}.tar.gz
+   'tomcat'
+   'tomcat.conf.d')
+md5sums=('d09a09bc84409510574a673d35939f16'
+ '20e6a8e89a148e2b0ac81ca03ceea6b1'
+ '368322d8a51ce20cc5dbdb505706a16a')
+
+build() {
+  unset LDFLAGS
+  # build jsvc
+  cd ${srcdir}/apache-${pkgname}-${pkgver}/bin
+  tar xzf commons-daemon-native.tar.gz
+  cd commons-daemon-1.0.7-native-src/unix
+  sh configure --with-java=/usr/lib/jvm/java-6-openjdk
+  make clean
+  make
+  cp jsvc ../..
+}
+
+package() {
+  cd ${srcdir}/apache-${pkgname}-${pkgver}/bin
+  # get rid of some cruft
+  

[arch-commits] Commit in (5 files)

2011-09-26 Thread andyrtr
Date: Monday, September 26, 2011 @ 14:32:26
  Author: andyrtr
Revision: 138509

initial java7 branch; based on the openjdk6 pkg, updated to a recent hg shot

Added:
  icedtea-web-java7/
  icedtea-web-java7/repos/
  icedtea-web-java7/trunk/
  icedtea-web-java7/trunk/PKGBUILD
  icedtea-web-java7/trunk/icedtea-web-java7.install

---+
 PKGBUILD  |   94 
 icedtea-web-java7.install |   11 +
 2 files changed, 105 insertions(+)

Added: icedtea-web-java7/trunk/PKGBUILD
===
--- icedtea-web-java7/trunk/PKGBUILD(rev 0)
+++ icedtea-web-java7/trunk/PKGBUILD2011-09-26 18:32:26 UTC (rev 138509)
@@ -0,0 +1,94 @@
+# $Id: PKGBUILD 136836 2011-09-02 07:59:01Z andyrtr $
+# Maintainer: Andreas Radke andy...@archlinux.org
+
+pkgbase=icedtea-web-java7
+pkgname=('icedtea-web-java7' 'icedtea-web-java7-doc')
+pkgver=1.1.3
+_date=20110925
+pkgrel=0.${_date}.1
+arch=('i686' 'x86_64')
+url=http://icedtea.classpath.org/wiki/IcedTea-Web;
+license=('GPL2')
+makedepends=('jdk7-openjdk' 'zip' 'xulrunner')
+source=(${pkgbase}-${_date}.tar.xz)
+#http://icedtea.classpath.org/download/source/${pkgname}-${pkgver}.tar.gz
+md5sums=('5da8a5aa74fb92fcb84cb9921c909ab1')
+
+_javaver=7
+_jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk
+
+mksource() {
+  mkdir /tmp/${pkgbase}-${_date}
+  pushd /tmp/${pkgbase}-${_date}
+  hg clone http://icedtea.classpath.org/hg/icedtea-web ${pkgbase}-${_date}
+  rm -rf ${pkgbase}-${_date}/.hg*
+  tar -cvJf /tmp/${pkgbase}-${_date}/${pkgbase}-${_date}.tar.xz *
+  popd
+}
+
+build() {
+  cd ${srcdir}/${pkgname}-${_date}
+
+  #. /etc/profile.d/jre.sh
+  . /etc/profile.d/jre7-openjdk.sh
+  #. /etc/profile.d/jdk.sh
+  . /etc/profile.d/jdk7-openjdk.sh
+  
+  autoreconf --force --install
+  
+  ./configure --prefix=${_jvmdir} \
+  --datarootdir=/usr/share \
+  --with-jdk-home=${_jvmdir}
+  make
+}
+
+check() {
+  cd ${srcdir}/${pkgname}-${_date}
+  make -k check
+}
+
+
+package_icedtea-web-java7() {
+
+  pkgdesc=provides a Free Software web browser plugin running applets written 
in the Java programming language and an implementation of Java Web Start, 
originally based on the NetX project
+  depends=('jre7-openjdk' 'gtk2' 'desktop-file-utils')
+  install=${pkgname}.install
+
+  cd ${srcdir}/${pkgname}-${_date}
+  # possible make target (see bottom of Makefile.am: install-exec-local 
install-data-local
+  make DESTDIR=${pkgdir} install-exec-local install-data-local
+
+  # Install desktop files.
+  install -m755 -d ${pkgdir}/usr/share/{applications,pixmaps}
+  install -m644 javaws.png ${pkgdir}/usr/share/pixmaps
+  install -m644 {javaws,itweb-settings}.desktop 
${pkgdir}/usr/share/applications
+  # remove splitted doc files
+  rm -rf ${pkgdir}/usr/share/doc
+
+  # link binaries into /usr/bin + jre/bin
+  install -m755 -d ${pkgdir}/usr/bin
+  install -m755 -d ${pkgdir}/${_jvmdir}/jre/bin
+  pushd ${pkgdir}/${_jvmdir}/bin
+  for file in *; do
+ln -sf ${_jvmdir}/bin/${file} ${pkgdir}/usr/bin
+ln -sf ${_jvmdir}/bin/${file} ${pkgdir}/${_jvmdir}/jre/bin
+  done
+  popd
+
+  # link the mozilla-plugin - test it here 
http://www.java.com/en/download/help/testvm.xml
+  install -m755 -d ${pkgdir}/usr/lib/mozilla/plugins/
+  ln -sf ${_jvmdir}/lib/IcedTeaPlugin.so ${pkgdir}/usr/lib/mozilla/plugins/
+}
+
+package_icedtea-web-java7-doc() {
+
+  pkgdesc=icedtea-web browser plugin + Java WebStart - documentation files
+
+  cd ${srcdir}/${pkgbase}-${_date}
+#  install -m755 -d ${pkgdir}/${_jvmdir}/jre/lib
+  make DESTDIR=${pkgdir} install-data-local
+  # remove javaws about and man page
+  rm -rf ${pkgdir}/usr/lib
+  rm -rf ${pkgdir}/usr/share/man
+  rm -rf ${pkgdir}/usr/share/icedtea-web # conflicting and unneeded file it 
seems
+}

Added: icedtea-web-java7/trunk/icedtea-web-java7.install
===
--- icedtea-web-java7/trunk/icedtea-web-java7.install   
(rev 0)
+++ icedtea-web-java7/trunk/icedtea-web-java7.install   2011-09-26 18:32:26 UTC 
(rev 138509)
@@ -0,0 +1,11 @@
+post_install() {
+  update-desktop-database -q
+}
+
+post_upgrade() {
+  update-desktop-database -q
+}
+
+post_remove() {
+  update-desktop-database -q
+}



[arch-commits] Commit in rsync/trunk (PKGBUILD)

2011-09-26 Thread Angel Velásquez
Date: Monday, September 26, 2011 @ 14:42:27
  Author: angvp
Revision: 138510

upgpkg: rsync 3.0.9-1

Version bump to 3.0.9

Modified:
  rsync/trunk/PKGBUILD

--+
 PKGBUILD |9 -
 1 file changed, 4 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-09-26 18:32:26 UTC (rev 138509)
+++ PKGBUILD2011-09-26 18:42:27 UTC (rev 138510)
@@ -4,8 +4,8 @@
 # Contributor: Judd Vinet jvi...@zeroflux.org
 # Contributor: Daniel J Griffiths ghost1...@archlinux.us
 pkgname=rsync
-pkgver=3.0.8
-pkgrel=2
+pkgver=3.0.9
+pkgrel=1
 pkgdesc=A file transfer program to keep remote files in sync
 arch=('i686' 'x86_64')
 url=http://samba.anu.edu.au/rsync/;
@@ -15,11 +15,11 @@
 changelog=ChangeLog
 source=(http://rsync.samba.org/ftp/rsync/${pkgname}-${pkgver}.tar.gz \
 rsyncd.conf rsyncd rsync.xinetd)
-md5sums=('0ee8346ce16bdfe4c88a236e94c752b4'
+md5sums=('5ee72266fe2c1822333c407e1761b92b'
  '4395c0591638349b1a7aeaaa4da1f03a'
  '7a9ce3b5de97f3aae29b906f93e1d157'
  'ea3e9277dc908bc51f9eddc0f6b935c1')
-sha1sums=('10e80173c7e9ed8b8a4dc9e8fdab08402da5f08d'
+sha1sums=('c64c8341984aea647506eb504496999fd968ddfc'
   '48be09294134dfed18872fe552a59c29147a'
   'eda623c31d9def454cf8e3e88dcf63de4ca5c08b'
   'fdb99785bc87ee13d77aa90dc1804f3f75dd7fc1')
@@ -39,4 +39,3 @@
install -Dm644 ../rsyncd.conf ${pkgdir}/etc/rsyncd.conf 
install -Dm644 ../rsync.xinetd ${pkgdir}/etc/xinetd.d/rsync 
 }
-



[arch-commits] Commit in rsync/repos (12 files)

2011-09-26 Thread Angel Velásquez
Date: Monday, September 26, 2011 @ 14:43:51
  Author: angvp
Revision: 138511

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  rsync/repos/testing-i686/
  rsync/repos/testing-i686/ChangeLog
(from rev 138510, rsync/trunk/ChangeLog)
  rsync/repos/testing-i686/PKGBUILD
(from rev 138510, rsync/trunk/PKGBUILD)
  rsync/repos/testing-i686/rsync.xinetd
(from rev 138510, rsync/trunk/rsync.xinetd)
  rsync/repos/testing-i686/rsyncd
(from rev 138510, rsync/trunk/rsyncd)
  rsync/repos/testing-i686/rsyncd.conf
(from rev 138510, rsync/trunk/rsyncd.conf)
  rsync/repos/testing-x86_64/
  rsync/repos/testing-x86_64/ChangeLog
(from rev 138510, rsync/trunk/ChangeLog)
  rsync/repos/testing-x86_64/PKGBUILD
(from rev 138510, rsync/trunk/PKGBUILD)
  rsync/repos/testing-x86_64/rsync.xinetd
(from rev 138510, rsync/trunk/rsync.xinetd)
  rsync/repos/testing-x86_64/rsyncd
(from rev 138510, rsync/trunk/rsyncd)
  rsync/repos/testing-x86_64/rsyncd.conf
(from rev 138510, rsync/trunk/rsyncd.conf)

-+
 testing-i686/ChangeLog  |   39 ++
 testing-i686/PKGBUILD   |   41 
 testing-i686/rsync.xinetd   |   11 ++
 testing-i686/rsyncd |   43 ++
 testing-i686/rsyncd.conf|   16 +++
 testing-x86_64/ChangeLog|   39 ++
 testing-x86_64/PKGBUILD |   41 
 testing-x86_64/rsync.xinetd |   11 ++
 testing-x86_64/rsyncd   |   43 ++
 testing-x86_64/rsyncd.conf  |   16 +++
 10 files changed, 300 insertions(+)

Copied: rsync/repos/testing-i686/ChangeLog (from rev 138510, 
rsync/trunk/ChangeLog)
===
--- testing-i686/ChangeLog  (rev 0)
+++ testing-i686/ChangeLog  2011-09-26 18:43:51 UTC (rev 138511)
@@ -0,0 +1,39 @@
+2011-05-17  Angel Velasquez an...@archlinux.org
+* rsync 3.0.8-2
+   * Added call_rsync func to rsyncd to support pass arguments to the 
daemon
+
+2010-01-01  Eric Belanger  e...@archlinux.org
+
+   * rsync 3.0.7-1
+   * Upstream update
+
+2009-05-08  Eric Belanger  e...@archlinux.org
+
+   * rsync 3.0.6-1
+   * Upstream update
+
+2008-12-29  Eric Belanger  e...@archlinux.org
+
+   * rsync 3.0.5-1
+   * Upstream update
+
+2008-09-06  Eric Belanger  e...@archlinux.org
+
+   * rsync 3.0.4-1
+   * Upstream update
+
+2008-07-05  Eric Belanger  e...@archlinux.org
+
+   * rsync 3.0.3-1
+   * Upstream update
+
+2008-04-13  Eric Belanger  e...@archlinux.org
+
+   * rsync 3.0.2-1
+   * Upstream update
+
+2008-03-01  Eric Belanger  e...@archlinux.org
+
+   * rsync 3.0.0-1
+   * Upstream update
+   * Updated license

Copied: rsync/repos/testing-i686/PKGBUILD (from rev 138510, 
rsync/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2011-09-26 18:43:51 UTC (rev 138511)
@@ -0,0 +1,41 @@
+# $Id$
+# Maintainer: Angel Velasquez an...@archlinux.org 
+# Contributor: Eric Belanger e...@archlinux.org
+# Contributor: Judd Vinet jvi...@zeroflux.org
+# Contributor: Daniel J Griffiths ghost1...@archlinux.us
+pkgname=rsync
+pkgver=3.0.9
+pkgrel=1
+pkgdesc=A file transfer program to keep remote files in sync
+arch=('i686' 'x86_64')
+url=http://samba.anu.edu.au/rsync/;
+license=('GPL3')
+depends=('acl')
+backup=('etc/rsyncd.conf' 'etc/xinetd.d/rsync')
+changelog=ChangeLog
+source=(http://rsync.samba.org/ftp/rsync/${pkgname}-${pkgver}.tar.gz \
+rsyncd.conf rsyncd rsync.xinetd)
+md5sums=('5ee72266fe2c1822333c407e1761b92b'
+ '4395c0591638349b1a7aeaaa4da1f03a'
+ '7a9ce3b5de97f3aae29b906f93e1d157'
+ 'ea3e9277dc908bc51f9eddc0f6b935c1')
+sha1sums=('c64c8341984aea647506eb504496999fd968ddfc'
+  '48be09294134dfed18872fe552a59c29147a'
+  'eda623c31d9def454cf8e3e88dcf63de4ca5c08b'
+  'fdb99785bc87ee13d77aa90dc1804f3f75dd7fc1')
+
+build() {
+   cd ${srcdir}/${pkgname}-${pkgver}
+   ./prepare-source 
+   ./configure --prefix=/usr --with-included-popt \
+  --enable-acl-support --enable-xattr-support 
+   make 
+}
+
+package() {
+   cd ${srcdir}/${pkgname}-${pkgver}
+   make DESTDIR=${pkgdir} install 
+   install -Dm755 ../rsyncd ${pkgdir}/etc/rc.d/rsyncd 
+   install -Dm644 ../rsyncd.conf ${pkgdir}/etc/rsyncd.conf 
+   install -Dm644 ../rsync.xinetd ${pkgdir}/etc/xinetd.d/rsync 
+}

Copied: rsync/repos/testing-i686/rsync.xinetd (from rev 138510, 
rsync/trunk/rsync.xinetd)
===
--- testing-i686/rsync.xinetd   (rev 0)
+++ 

[arch-commits] Commit in icedtea-web-java7/trunk (PKGBUILD)

2011-09-26 Thread andyrtr
Date: Monday, September 26, 2011 @ 14:51:54
  Author: andyrtr
Revision: 138512

upgpkg: icedtea-web-java7 1.1.3-0.20110925.1

initial java7 plugin pkg

Modified:
  icedtea-web-java7/trunk/PKGBUILD

--+
 PKGBUILD |   13 +++--
 1 file changed, 7 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-09-26 18:43:51 UTC (rev 138511)
+++ PKGBUILD2011-09-26 18:51:54 UTC (rev 138512)
@@ -10,9 +10,10 @@
 url=http://icedtea.classpath.org/wiki/IcedTea-Web;
 license=('GPL2')
 makedepends=('jdk7-openjdk' 'zip' 'xulrunner')
-source=(${pkgbase}-${_date}.tar.xz)
-#http://icedtea.classpath.org/download/source/${pkgname}-${pkgver}.tar.gz
+source=(ftp://ftp.archlinux.org/other/$pkgname/${pkgbase}-${_date}.tar.xz)
+   
#http://icedtea.classpath.org/download/source/${pkgname}-${pkgver}.tar.gz
 md5sums=('5da8a5aa74fb92fcb84cb9921c909ab1')
+sha1sums=('b9b1fb5ee4f280945cd22731af49f25038592607')
 
 _javaver=7
 _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk
@@ -27,7 +28,7 @@
 }
 
 build() {
-  cd ${srcdir}/${pkgname}-${_date}
+  cd ${srcdir}/icedtea-web* #${pkgname}-${_date}
 
   #. /etc/profile.d/jre.sh
   . /etc/profile.d/jre7-openjdk.sh
@@ -43,7 +44,7 @@
 }
 
 check() {
-  cd ${srcdir}/${pkgname}-${_date}
+  cd ${srcdir}/icedtea-web* #${pkgname}-${_date}
   make -k check
 }
 
@@ -54,7 +55,7 @@
   depends=('jre7-openjdk' 'gtk2' 'desktop-file-utils')
   install=${pkgname}.install
 
-  cd ${srcdir}/${pkgname}-${_date}
+  cd ${srcdir}/icedtea-web* #${pkgname}-${_date}
   # possible make target (see bottom of Makefile.am: install-exec-local 
install-data-local
   make DESTDIR=${pkgdir} install-exec-local install-data-local
 
@@ -84,7 +85,7 @@
 
   pkgdesc=icedtea-web browser plugin + Java WebStart - documentation files
 
-  cd ${srcdir}/${pkgbase}-${_date}
+  cd ${srcdir}/icedtea-web* #${pkgbase}-${_date}
 #  install -m755 -d ${pkgdir}/${_jvmdir}/jre/lib
   make DESTDIR=${pkgdir} install-data-local
   # remove javaws about and man page



[arch-commits] Commit in icedtea-web-java7/repos (6 files)

2011-09-26 Thread andyrtr
Date: Monday, September 26, 2011 @ 14:53:04
  Author: andyrtr
Revision: 138513

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  icedtea-web-java7/repos/testing-i686/
  icedtea-web-java7/repos/testing-i686/PKGBUILD
(from rev 138512, icedtea-web-java7/trunk/PKGBUILD)
  icedtea-web-java7/repos/testing-i686/icedtea-web-java7.install
(from rev 138512, icedtea-web-java7/trunk/icedtea-web-java7.install)
  icedtea-web-java7/repos/testing-x86_64/
  icedtea-web-java7/repos/testing-x86_64/PKGBUILD
(from rev 138512, icedtea-web-java7/trunk/PKGBUILD)
  icedtea-web-java7/repos/testing-x86_64/icedtea-web-java7.install
(from rev 138512, icedtea-web-java7/trunk/icedtea-web-java7.install)

--+
 testing-i686/PKGBUILD|   95 +
 testing-i686/icedtea-web-java7.install   |   11 +++
 testing-x86_64/PKGBUILD  |   95 +
 testing-x86_64/icedtea-web-java7.install |   11 +++
 4 files changed, 212 insertions(+)

Copied: icedtea-web-java7/repos/testing-i686/PKGBUILD (from rev 138512, 
icedtea-web-java7/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2011-09-26 18:53:04 UTC (rev 138513)
@@ -0,0 +1,95 @@
+# $Id: PKGBUILD 136836 2011-09-02 07:59:01Z andyrtr $
+# Maintainer: Andreas Radke andy...@archlinux.org
+
+pkgbase=icedtea-web-java7
+pkgname=('icedtea-web-java7' 'icedtea-web-java7-doc')
+pkgver=1.1.3
+_date=20110925
+pkgrel=0.${_date}.1
+arch=('i686' 'x86_64')
+url=http://icedtea.classpath.org/wiki/IcedTea-Web;
+license=('GPL2')
+makedepends=('jdk7-openjdk' 'zip' 'xulrunner')
+source=(ftp://ftp.archlinux.org/other/$pkgname/${pkgbase}-${_date}.tar.xz)
+   
#http://icedtea.classpath.org/download/source/${pkgname}-${pkgver}.tar.gz
+md5sums=('5da8a5aa74fb92fcb84cb9921c909ab1')
+sha1sums=('b9b1fb5ee4f280945cd22731af49f25038592607')
+
+_javaver=7
+_jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk
+
+mksource() {
+  mkdir /tmp/${pkgbase}-${_date}
+  pushd /tmp/${pkgbase}-${_date}
+  hg clone http://icedtea.classpath.org/hg/icedtea-web ${pkgbase}-${_date}
+  rm -rf ${pkgbase}-${_date}/.hg*
+  tar -cvJf /tmp/${pkgbase}-${_date}/${pkgbase}-${_date}.tar.xz *
+  popd
+}
+
+build() {
+  cd ${srcdir}/icedtea-web* #${pkgname}-${_date}
+
+  #. /etc/profile.d/jre.sh
+  . /etc/profile.d/jre7-openjdk.sh
+  #. /etc/profile.d/jdk.sh
+  . /etc/profile.d/jdk7-openjdk.sh
+  
+  autoreconf --force --install
+  
+  ./configure --prefix=${_jvmdir} \
+  --datarootdir=/usr/share \
+  --with-jdk-home=${_jvmdir}
+  make
+}
+
+check() {
+  cd ${srcdir}/icedtea-web* #${pkgname}-${_date}
+  make -k check
+}
+
+
+package_icedtea-web-java7() {
+
+  pkgdesc=provides a Free Software web browser plugin running applets written 
in the Java programming language and an implementation of Java Web Start, 
originally based on the NetX project
+  depends=('jre7-openjdk' 'gtk2' 'desktop-file-utils')
+  install=${pkgname}.install
+
+  cd ${srcdir}/icedtea-web* #${pkgname}-${_date}
+  # possible make target (see bottom of Makefile.am: install-exec-local 
install-data-local
+  make DESTDIR=${pkgdir} install-exec-local install-data-local
+
+  # Install desktop files.
+  install -m755 -d ${pkgdir}/usr/share/{applications,pixmaps}
+  install -m644 javaws.png ${pkgdir}/usr/share/pixmaps
+  install -m644 {javaws,itweb-settings}.desktop 
${pkgdir}/usr/share/applications
+  # remove splitted doc files
+  rm -rf ${pkgdir}/usr/share/doc
+
+  # link binaries into /usr/bin + jre/bin
+  install -m755 -d ${pkgdir}/usr/bin
+  install -m755 -d ${pkgdir}/${_jvmdir}/jre/bin
+  pushd ${pkgdir}/${_jvmdir}/bin
+  for file in *; do
+ln -sf ${_jvmdir}/bin/${file} ${pkgdir}/usr/bin
+ln -sf ${_jvmdir}/bin/${file} ${pkgdir}/${_jvmdir}/jre/bin
+  done
+  popd
+
+  # link the mozilla-plugin - test it here 
http://www.java.com/en/download/help/testvm.xml
+  install -m755 -d ${pkgdir}/usr/lib/mozilla/plugins/
+  ln -sf ${_jvmdir}/lib/IcedTeaPlugin.so ${pkgdir}/usr/lib/mozilla/plugins/
+}
+
+package_icedtea-web-java7-doc() {
+
+  pkgdesc=icedtea-web browser plugin + Java WebStart - documentation files
+
+  cd ${srcdir}/icedtea-web* #${pkgbase}-${_date}
+#  install -m755 -d ${pkgdir}/${_jvmdir}/jre/lib
+  make DESTDIR=${pkgdir} install-data-local
+  # remove javaws about and man page
+  rm -rf ${pkgdir}/usr/lib
+  rm -rf ${pkgdir}/usr/share/man
+  rm -rf ${pkgdir}/usr/share/icedtea-web # conflicting and unneeded file it 
seems
+}

Copied: icedtea-web-java7/repos/testing-i686/icedtea-web-java7.install (from 
rev 138512, icedtea-web-java7/trunk/icedtea-web-java7.install)
===
--- testing-i686/icedtea-web-java7.install  (rev 0)
+++ testing-i686/icedtea-web-java7.install  2011-09-26 18:53:04 UTC (rev 
138513)
@@ 

[arch-commits] Commit in tzdata/trunk (PKGBUILD)

2011-09-26 Thread andyrtr
Date: Monday, September 26, 2011 @ 15:10:22
  Author: andyrtr
Revision: 138514

upgpkg: tzdata 2011k-1

upstream update 2011k

Modified:
  tzdata/trunk/PKGBUILD

--+
 PKGBUILD |   13 -
 1 file changed, 8 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-09-26 18:53:04 UTC (rev 138513)
+++ PKGBUILD2011-09-26 19:10:22 UTC (rev 138514)
@@ -2,10 +2,10 @@
 # Maintainer: Andreas Radke andy...@archlinux.org
 
 pkgname=tzdata
-pkgver=2011h
+pkgver=2011k
 pkgrel=1
-_tzcode=2011g
-_tzdata=2011h
+_tzcode=2011i
+_tzdata=2011k
 pkgdesc=Sources for time zone and daylight saving time data
 arch=('i686' 'x86_64')
 url=http://www.twinsun.com/tz/tz-link.htm;
@@ -17,9 +17,12 @@
 source=(ftp://elsie.nci.nih.gov/pub/tzcode${_tzcode}.tar.gz \
 ftp://elsie.nci.nih.gov/pub/${pkgname}${_tzdata}.tar.gz \
 Makefile.patch)
-md5sums=('ecb564279b28c5b184421c525d997d6c'
- '546d27b6c1e5e1097bd512651815017f'
+md5sums=('cf7f4335b7c8682899fa2814e711c1b2'
+ '9da1c2d4d1a01f9f504b73ccd371830f'
  'a64ed97d1fc03c66ee8612c0d9f40507')
+sha1sums=('4f58cede47df8bba55b37982d8b38cd65266d412'
+  '56f0847a10eaea672be19984b4b403e29631c98b'
+  'e8890681333949977ccff0b7a429ad25ed78dbcf')
 
 build() {
   cd ${srcdir}



[arch-commits] Commit in tzdata/repos (6 files)

2011-09-26 Thread andyrtr
Date: Monday, September 26, 2011 @ 15:11:52
  Author: andyrtr
Revision: 138515

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  tzdata/repos/testing-i686/
  tzdata/repos/testing-i686/Makefile.patch
(from rev 138514, tzdata/trunk/Makefile.patch)
  tzdata/repos/testing-i686/PKGBUILD
(from rev 138514, tzdata/trunk/PKGBUILD)
  tzdata/repos/testing-x86_64/
  tzdata/repos/testing-x86_64/Makefile.patch
(from rev 138514, tzdata/trunk/Makefile.patch)
  tzdata/repos/testing-x86_64/PKGBUILD
(from rev 138514, tzdata/trunk/PKGBUILD)

---+
 testing-i686/Makefile.patch   |  140 
 testing-i686/PKGBUILD |   48 +
 testing-x86_64/Makefile.patch |  140 
 testing-x86_64/PKGBUILD   |   48 +
 4 files changed, 376 insertions(+)

Copied: tzdata/repos/testing-i686/Makefile.patch (from rev 138514, 
tzdata/trunk/Makefile.patch)
===
--- testing-i686/Makefile.patch (rev 0)
+++ testing-i686/Makefile.patch 2011-09-26 19:11:52 UTC (rev 138515)
@@ -0,0 +1,140 @@
+diff -Naur src/Makefile src-p/Makefile
+--- src/Makefile   2007-08-20 16:47:41.0 +0200
 src-p/Makefile 2007-10-02 04:07:44.0 +0200
+@@ -34,17 +34,17 @@
+ 
+ # Everything gets put in subdirectories of. . .
+ 
+-TOPDIR=   /usr/local
++TOPDIR=   $(DESTDIR)/usr
+ 
+ # Compiled time zone information is placed in the TZDIR directory
+ # (and subdirectories).
+ # Use an absolute path name for TZDIR unless you're just testing the software.
+ 
+-TZDIR=$(TOPDIR)/etc/zoneinfo
++TZDIR=$(TOPDIR)/share/zoneinfo
+ 
+ # The tzselect, zic, and zdump commands get installed in. . .
+ 
+-ETCDIR=   $(TOPDIR)/etc
++SBINDIR=  $(TOPDIR)/sbin
+ 
+ # If you make INSTALL, the date command gets installed in. . .
+ 
+@@ -52,7 +52,7 @@
+ 
+ # Manual pages go in subdirectories of. . .
+ 
+-MANDIR=   $(TOPDIR)/man
++MANDIR=   $(TOPDIR)/share/man
+ 
+ # Library functions are put in an archive in LIBDIR.
+ 
+@@ -83,7 +83,7 @@
+ 
+ # Non-default libraries needed to link.
+ # Add -lintl if you want to use `gettext' on Solaris.
+-LDLIBS=
++LDLIBS=$(LDFLAGS)
+ 
+ # Add the following to the end of the CFLAGS= line as needed.
+ #  -Dconst= if `const' does not work (SunOS 4.x cc, OSF1 V5.0 cc)
+@@ -211,7 +211,7 @@
+ # before the first Monday in January when a %V format is used and January 1
+ # falls on a Friday, Saturday, or Sunday.
+ 
+-CFLAGS=
++CFLAGS += -std=gnu99
+ 
+ # If you want zic's -s option used when installing, uncomment the next line
+ # ZFLAGS= -s
+@@ -220,7 +220,7 @@
+ ZIC=  $(zic) $(ZFLAGS)
+ 
+ # The name of a Posix-compliant `awk' on your system.
+-AWK=  nawk
++AWK=  awk
+ 
+ # The path where SGML DTDs are kept.
+ SGML_SEARCH_PATH= $(TOPDIR)/share/doc/sgml-lib/REC-html401-19991224/
+@@ -241,8 +241,10 @@
+ 
+ 
###
+ 
+-cc=   cc
+-CC=   $(cc) -DTZDIR=\$(TZDIR)\
++CC+=  -DTZDIR=\$(TZDIR)\
++ifeq ($(NLS),1)
++CC += -DHAVE_GETTEXT=1 -DTZ_DOMAIN=\libc\
++endif
+ 
+ TZCSRCS=  zic.c localtime.c asctime.c scheck.c ialloc.c
+ TZCOBJS=  zic.o localtime.o asctime.o scheck.o ialloc.o
+@@ -282,14 +284,16 @@
+ 
+ ALL:  all date
+ 
+-install:  all $(DATA) $(REDO) $(TZLIB) $(MANS) $(TABDATA)
++install:  all $(DATA) $(REDO) $(MANS) $(TABDATA)
+   $(ZIC) -y $(YEARISTYPE) \
+   -d $(TZDIR) -l $(LOCALTIME) -p $(POSIXRULES)
+   -rm -f $(TZDIR)/iso3166.tab $(TZDIR)/zone.tab
+   cp iso3166.tab zone.tab $(TZDIR)/.
+-  -mkdir $(TOPDIR) $(ETCDIR)
+-  cp tzselect zic zdump $(ETCDIR)/.
+-  -mkdir $(TOPDIR) $(MANDIR) \
++  -mkdir -p $(TOPDIR) $(SBINDIR)
++  cp zic zdump $(SBINDIR)/.
++  -mkdir -p $(TOPDIR) $(BINDIR)
++  cp tzselect $(BINDIR)/.
++  -mkdir -p $(TOPDIR) $(MANDIR) \
+   $(MANDIR)/man3 $(MANDIR)/man5 $(MANDIR)/man8
+   -rm -f $(MANDIR)/man3/newctime.3 \
+   $(MANDIR)/man3/newtzset.3 \
+@@ -298,13 +302,11 @@
+   $(MANDIR)/man8/zdump.8 \
+   $(MANDIR)/man8/zic.8
+   cp newctime.3 newtzset.3 $(MANDIR)/man3/.
+-  cp tzfile.5 $(MANDIR)/man5/.
+-  cp tzselect.8 zdump.8 zic.8 $(MANDIR)/man8/.
+ 
+ INSTALL:  ALL install date.1
+-  -mkdir $(TOPDIR) $(BINDIR)
++  -mkdir -p $(TOPDIR) $(BINDIR)
+   cp date $(BINDIR)/.
+-  -mkdir $(TOPDIR) $(MANDIR) $(MANDIR)/man1
++  -mkdir -p $(TOPDIR) $(MANDIR) $(MANDIR)/man1
+   -rm -f 

[arch-commits] Commit in sqlite3/trunk (PKGBUILD)

2011-09-26 Thread andyrtr
Date: Monday, September 26, 2011 @ 15:19:59
  Author: andyrtr
Revision: 138516

upgpkg: sqlite3 3.7.8-1

upstream update 3.7.8

Modified:
  sqlite3/trunk/PKGBUILD

--+
 PKGBUILD |9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-09-26 19:11:52 UTC (rev 138515)
+++ PKGBUILD2011-09-26 19:19:59 UTC (rev 138516)
@@ -4,7 +4,7 @@
 
 pkgbase=sqlite3
 pkgname=('sqlite3' 'sqlite3-tcl' 'sqlite3-doc') 
-_amalgamationver=3070701
+_amalgamationver=3070800
 _amalgamationver2=${_amalgamationver/00/}
 _docver=${_amalgamationver}#3070700
 pkgver=${_amalgamationver2//0/.}
@@ -20,9 +20,12 @@
http://www.sqlite.org/sqlite-doc-${_docver}.zip
license.txt)
 options=('!libtool' '!emptydirs')
-md5sums=('554026fe7fac47b1cf61c18d5fe43419'
- '2bca5613abf9352bc525b6a8fd80156e'
+md5sums=('6bfb46d73caaa1bbbcd2b52184b6c542'
+ '56c2e37c65075c612710ae1aba9703f2'
  'c1cdbc5544034d9012e421e75a5e4890')
+sha1sums=('34852cfd49ddea440eb26a35ad32deee0176a724'
+  'e8fec8ca866289477ea4249c219e07bc301d96c6'
+  'f34f6daa4ab3073d74e774aad21d66878cf26853')
 
 build() {
   export CFLAGS=$CFLAGS -DSQLITE_ENABLE_FTS3=1 
-DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_ENABLE_UNLOCK_NOTIFY 
-DSQLITE_SECURE_DELETE



[arch-commits] Commit in sqlite3/repos (6 files)

2011-09-26 Thread andyrtr
Date: Monday, September 26, 2011 @ 15:21:09
  Author: andyrtr
Revision: 138517

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  sqlite3/repos/testing-i686/
  sqlite3/repos/testing-i686/PKGBUILD
(from rev 138516, sqlite3/trunk/PKGBUILD)
  sqlite3/repos/testing-i686/license.txt
(from rev 138516, sqlite3/trunk/license.txt)
  sqlite3/repos/testing-x86_64/
  sqlite3/repos/testing-x86_64/PKGBUILD
(from rev 138516, sqlite3/trunk/PKGBUILD)
  sqlite3/repos/testing-x86_64/license.txt
(from rev 138516, sqlite3/trunk/license.txt)

+
 testing-i686/PKGBUILD  |   86 +++
 testing-i686/license.txt   |   33 
 testing-x86_64/PKGBUILD|   86 +++
 testing-x86_64/license.txt |   33 
 4 files changed, 238 insertions(+)

Copied: sqlite3/repos/testing-i686/PKGBUILD (from rev 138516, 
sqlite3/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2011-09-26 19:21:09 UTC (rev 138517)
@@ -0,0 +1,86 @@
+# $Id$
+# Maintainer: Andreas Radke andy...@archlinux.org
+# Contributor: Tom Newsom jeeps...@gmx.co.uk
+
+pkgbase=sqlite3
+pkgname=('sqlite3' 'sqlite3-tcl' 'sqlite3-doc') 
+_amalgamationver=3070800
+_amalgamationver2=${_amalgamationver/00/}
+_docver=${_amalgamationver}#3070700
+pkgver=${_amalgamationver2//0/.}
+pkgrel=1
+pkgdesc=A C library that implements an SQL database engine
+arch=('i686' 'x86_64')
+license=('custom')
+url=http://www.sqlite.org/;
+makedepends=('tcl' 'readline=6.0.00')
+source=( # tarball containing the amalgamation for SQLite 3.7.5 together with 
a configure script and makefile for building it; includes now also the Tcl 
Extension Architecture (TEA)
+   http://www.sqlite.org/sqlite-autoconf-$_amalgamationver.tar.gz
+   #http://www.sqlite.org/sqlite-doc-${_amalgamationver}.zip
+   http://www.sqlite.org/sqlite-doc-${_docver}.zip
+   license.txt)
+options=('!libtool' '!emptydirs')
+md5sums=('6bfb46d73caaa1bbbcd2b52184b6c542'
+ '56c2e37c65075c612710ae1aba9703f2'
+ 'c1cdbc5544034d9012e421e75a5e4890')
+sha1sums=('34852cfd49ddea440eb26a35ad32deee0176a724'
+  'e8fec8ca866289477ea4249c219e07bc301d96c6'
+  'f34f6daa4ab3073d74e774aad21d66878cf26853')
+
+build() {
+  export CFLAGS=$CFLAGS -DSQLITE_ENABLE_FTS3=1 
-DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_ENABLE_UNLOCK_NOTIFY 
-DSQLITE_SECURE_DELETE
+
+  # build sqlite
+  cd $srcdir/sqlite-autoconf-$_amalgamationver
+  ./configure --prefix=/usr \
+   --disable-static
+  make
+  
+  # build the tcl extension
+  cd $srcdir/sqlite-autoconf-$_amalgamationver/tea
+  ./configure --prefix=/usr \
+   --with-system-sqlite
+  make
+
+}
+
+package_sqlite3() {
+ 
+ pkgdesc=A C library that implements an SQL database engine
+ depends=('readline=6.0.00')
+ conflicts=('sqlite')
+ replaces=('sqlite')
+ 
+  cd ${srcdir}/sqlite-autoconf-$_amalgamationver
+  make DESTDIR=${pkgdir} install
+  
+  # license
+  install -D -m644 ${srcdir}/license.txt 
${pkgdir}/usr/share/licenses/${pkgname}/license.txt
+}
+
+package_sqlite3-tcl() {
+ 
+ pkgdesc=sqlite3 Tcl Extension Architecture (TEA)
+ depends=('sqlite3=3.7.5')
+
+  cd ${srcdir}/sqlite-autoconf-$_amalgamationver/tea
+  make DESTDIR=${pkgdir} install
+}
+
+package_sqlite3-doc() {
+ pkgdesc=most of the static HTML files that comprise this website, including 
all of the SQL Syntax and the C/C++ interface specs and other miscellaneous 
documentation
+ #arch=('any') - not yet supported
+
+  #cd ${srcdir}/sqlite-doc-${_amalgamationver}
+  cd ${srcdir}/sqlite-doc-${_docver}
+  mkdir -p ${pkgdir}/usr/share/doc/${pkgbase}
+  cp -R *  ${pkgdir}/usr/share/doc/${pkgbase}/
+  
+  # fix permissions and remove obsolete files; 
https://bugs.archlinux.org/task/24605
+  find ${pkgdir} -perm 755 -exec ls -lha {} \;
+  find ${pkgdir} -perm 755 -exec chmod 644 {} \;
+  find ${pkgdir} -name '*~' -exec ls -lha {} \;
+  find ${pkgdir} -name '*~' -exec rm -f {} \;
+  find ${pkgdir} -name '.~*' -exec ls -lha {} \;
+  find ${pkgdir} -name '.~*' -exec rm -f {} \;
+}

Copied: sqlite3/repos/testing-i686/license.txt (from rev 138516, 
sqlite3/trunk/license.txt)
===
--- testing-i686/license.txt(rev 0)
+++ testing-i686/license.txt2011-09-26 19:21:09 UTC (rev 138517)
@@ -0,0 +1,33 @@
+SQLite Copyright
+SQLite is in the
+Public Domain 
+
+
+All of the deliverable code in SQLite has been dedicated to the public domain 
by the authors. All code authors, and representatives of the companies they 
work for, have signed affidavits dedicating their contributions to the public 
domain and originals of those signed affidavits are stored in a firesafe at the 
main offices of Hwaci. Anyone is free to copy, modify, publish, use, 

[arch-commits] Commit in getmail/trunk (PKGBUILD)

2011-09-26 Thread andyrtr
Date: Monday, September 26, 2011 @ 15:27:09
  Author: andyrtr
Revision: 138518

upgpkg: getmail 4.22.0-1

upstream update 4.22.0

Modified:
  getmail/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-09-26 19:21:09 UTC (rev 138517)
+++ PKGBUILD2011-09-26 19:27:09 UTC (rev 138518)
@@ -3,7 +3,7 @@
 # Committer: Manolis Tzanidakis mano...@archlinux.org
 
 pkgname=getmail
-pkgver=4.21.0
+pkgver=4.22.0
 pkgrel=1
 pkgdesc=A POP3 mail retriever with reliable Maildir and command delivery.
 arch=(any)
@@ -11,8 +11,8 @@
 license=(GPL)
 depends=('python2')
 
source=(http://pyropus.ca/software/getmail/old-versions/$pkgname-$pkgver.tar.gz)
-md5sums=('d07c49e68736d35f24647f7275e7b422')
-sha1sums=('6c555bb073d7eef2d564f4b0dde7e0c57644ae7a')
+md5sums=('0eb79135cc6fde683c95d17a771e10b5')
+sha1sums=('f4efe0eb0da422ce059048b98e452815fa097d07')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}



[arch-commits] Commit in getmail/repos/extra-any (PKGBUILD PKGBUILD)

2011-09-26 Thread andyrtr
Date: Monday, September 26, 2011 @ 15:27:36
  Author: andyrtr
Revision: 138519

archrelease: copy trunk to extra-any

Added:
  getmail/repos/extra-any/PKGBUILD
(from rev 138518, getmail/trunk/PKGBUILD)
Deleted:
  getmail/repos/extra-any/PKGBUILD

--+
 PKGBUILD |   56 
 1 file changed, 28 insertions(+), 28 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2011-09-26 19:27:09 UTC (rev 138518)
+++ PKGBUILD2011-09-26 19:27:36 UTC (rev 138519)
@@ -1,28 +0,0 @@
-# $Id$
-# Maintainer: Andreas Radke andy...@archlinux.org
-# Committer: Manolis Tzanidakis mano...@archlinux.org
-
-pkgname=getmail
-pkgver=4.21.0
-pkgrel=1
-pkgdesc=A POP3 mail retriever with reliable Maildir and command delivery.
-arch=(any)
-url=http://pyropus.ca/software/getmail;
-license=(GPL)
-depends=('python2')
-source=(http://pyropus.ca/software/getmail/old-versions/$pkgname-$pkgver.tar.gz)
-md5sums=('d07c49e68736d35f24647f7275e7b422')
-sha1sums=('6c555bb073d7eef2d564f4b0dde7e0c57644ae7a')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  python2 setup.py build
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  python2 setup.py install --root=${pkgdir}
-  # fix some broken shebang calls
-  sed -i -e s|#![ ]*/usr/bin/env python|#!/usr/bin/env python2| 
$pkgdir/usr/lib/python2.7/site-packages/getmailcore/__init__.py
-  sed -i -e s|#![ ]*/usr/bin/env python2.3|#!/usr/bin/env python2| $(find 
$pkgdir -name '*.py')
-}

Copied: getmail/repos/extra-any/PKGBUILD (from rev 138518, 
getmail/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2011-09-26 19:27:36 UTC (rev 138519)
@@ -0,0 +1,28 @@
+# $Id$
+# Maintainer: Andreas Radke andy...@archlinux.org
+# Committer: Manolis Tzanidakis mano...@archlinux.org
+
+pkgname=getmail
+pkgver=4.22.0
+pkgrel=1
+pkgdesc=A POP3 mail retriever with reliable Maildir and command delivery.
+arch=(any)
+url=http://pyropus.ca/software/getmail;
+license=(GPL)
+depends=('python2')
+source=(http://pyropus.ca/software/getmail/old-versions/$pkgname-$pkgver.tar.gz)
+md5sums=('0eb79135cc6fde683c95d17a771e10b5')
+sha1sums=('f4efe0eb0da422ce059048b98e452815fa097d07')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  python2 setup.py build
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  python2 setup.py install --root=${pkgdir}
+  # fix some broken shebang calls
+  sed -i -e s|#![ ]*/usr/bin/env python|#!/usr/bin/env python2| 
$pkgdir/usr/lib/python2.7/site-packages/getmailcore/__init__.py
+  sed -i -e s|#![ ]*/usr/bin/env python2.3|#!/usr/bin/env python2| $(find 
$pkgdir -name '*.py')
+}



[arch-commits] Commit in postgresql-old-upgrade/trunk (PKGBUILD build.patch)

2011-09-26 Thread Dan McGee
Date: Monday, September 26, 2011 @ 16:42:00
  Author: dan
Revision: 138520

upgpkg: postgresql-old-upgrade 9.0.5-1

bump to 9.0.5 in anticipation of 9.1.1 main package release

Modified:
  postgresql-old-upgrade/trunk/PKGBUILD
Deleted:
  postgresql-old-upgrade/trunk/build.patch

-+
 PKGBUILD|   14 --
 build.patch |   11 ---
 2 files changed, 4 insertions(+), 21 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-09-26 19:27:36 UTC (rev 138519)
+++ PKGBUILD2011-09-26 20:42:00 UTC (rev 138520)
@@ -2,7 +2,7 @@
 # Maintainer: Dan McGee d...@archlinux.org
 
 pkgname=postgresql-old-upgrade
-pkgver=8.4.8
+pkgver=9.0.5
 _majorver=${pkgver%.*}
 pkgrel=1
 pkgdesc=Minimal PostgreSQL build for migrating between major versions with 
pg_upgrade
@@ -10,15 +10,11 @@
 url=http://www.postgresql.org/;
 license=('custom:PostgreSQL')
 depends=(postgresql-libs=${_majorver} 'libxml2' 'openssl=1.0.0')
-source=(ftp://ftp.postgresql.org/pub/source/v${pkgver}/postgresql-${pkgver}.tar.bz2
-build.patch)
+source=(ftp://ftp.postgresql.org/pub/source/v${pkgver}/postgresql-${pkgver}.tar.bz2)
 
 build() {
   cd ${srcdir}/postgresql-${pkgver}
 
-  # patch to remove regress/test make target (won't build with it present)
-  patch -Np1 -i ../build.patch
-
   ./configure --prefix=/opt/pgsql-${_majorver} \
   --with-libxml --with-openssl --without-perl \
   --without-python --with-pam --without-readline \
@@ -41,7 +37,5 @@
   rm -rf ${pkgdir}/opt/pgsql-${_majorver}/include/
 }
 
-md5sums=('4603e8ea30cee97189b62b39022f2043'
- '4d74f4227dc5e12bf95b3490758d86c9')
-sha256sums=('3e90ef2a86a9f4831e21ff4a574fbfb8e1b8c097af637c93ec43c64c684a0938'
-'1f020ae1d921a6f47e4889c2026c5ef69879d204e14aeac9330f89b7e6088348')
+md5sums=('86816eb8a8513532957b96045abdfef9')
+sha256sums=('56d8ee809ceeabeae8461ae0a197943460cba5bf8fbe37324e4451cf2eb7d504')

Deleted: build.patch
===
--- build.patch 2011-09-26 19:27:36 UTC (rev 138519)
+++ build.patch 2011-09-26 20:42:00 UTC (rev 138520)
@@ -1,11 +0,0 @@
-diff -Naur postgresql-8.2.3-orig/src/Makefile postgresql-8.2.3/src/Makefile
 postgresql-8.2.3-orig/src/Makefile 2006-06-22 16:50:35.0 -0700
-+++ postgresql-8.2.3/src/Makefile  2007-03-05 10:46:24.0 -0800
-@@ -23,7 +23,6 @@
-   $(MAKE) -C bin $@
-   $(MAKE) -C pl $@
-   $(MAKE) -C makefiles $@
--  $(MAKE) -C test/regress $@
- 
- install: install-local
- 



[arch-commits] Commit in postgresql-old-upgrade/repos (4 files)

2011-09-26 Thread Dan McGee
Date: Monday, September 26, 2011 @ 16:42:13
  Author: dan
Revision: 138521

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  postgresql-old-upgrade/repos/testing-i686/
  postgresql-old-upgrade/repos/testing-i686/PKGBUILD
(from rev 138520, postgresql-old-upgrade/trunk/PKGBUILD)
  postgresql-old-upgrade/repos/testing-x86_64/
  postgresql-old-upgrade/repos/testing-x86_64/PKGBUILD
(from rev 138520, postgresql-old-upgrade/trunk/PKGBUILD)

-+
 testing-i686/PKGBUILD   |   41 +
 testing-x86_64/PKGBUILD |   41 +
 2 files changed, 82 insertions(+)

Copied: postgresql-old-upgrade/repos/testing-i686/PKGBUILD (from rev 138520, 
postgresql-old-upgrade/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2011-09-26 20:42:13 UTC (rev 138521)
@@ -0,0 +1,41 @@
+# $Id$
+# Maintainer: Dan McGee d...@archlinux.org
+
+pkgname=postgresql-old-upgrade
+pkgver=9.0.5
+_majorver=${pkgver%.*}
+pkgrel=1
+pkgdesc=Minimal PostgreSQL build for migrating between major versions with 
pg_upgrade
+arch=('i686' 'x86_64')
+url=http://www.postgresql.org/;
+license=('custom:PostgreSQL')
+depends=(postgresql-libs=${_majorver} 'libxml2' 'openssl=1.0.0')
+source=(ftp://ftp.postgresql.org/pub/source/v${pkgver}/postgresql-${pkgver}.tar.bz2)
+
+build() {
+  cd ${srcdir}/postgresql-${pkgver}
+
+  ./configure --prefix=/opt/pgsql-${_majorver} \
+  --with-libxml --with-openssl --without-perl \
+  --without-python --with-pam --without-readline \
+  --with-system-tzdata=/usr/share/zoneinfo --disable-nls \
+  --enable-thread-safety
+
+  make -C src all
+}
+
+package() {
+  cd ${srcdir}/postgresql-${pkgver}
+
+  # install
+  make DESTDIR=${pkgdir} -C src install
+
+  # install license
+  install -D -m644 COPYRIGHT ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+
+  # clean up unneeded installed items
+  rm -rf ${pkgdir}/opt/pgsql-${_majorver}/include/
+}
+
+md5sums=('86816eb8a8513532957b96045abdfef9')
+sha256sums=('56d8ee809ceeabeae8461ae0a197943460cba5bf8fbe37324e4451cf2eb7d504')

Copied: postgresql-old-upgrade/repos/testing-x86_64/PKGBUILD (from rev 138520, 
postgresql-old-upgrade/trunk/PKGBUILD)
===
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2011-09-26 20:42:13 UTC (rev 138521)
@@ -0,0 +1,41 @@
+# $Id$
+# Maintainer: Dan McGee d...@archlinux.org
+
+pkgname=postgresql-old-upgrade
+pkgver=9.0.5
+_majorver=${pkgver%.*}
+pkgrel=1
+pkgdesc=Minimal PostgreSQL build for migrating between major versions with 
pg_upgrade
+arch=('i686' 'x86_64')
+url=http://www.postgresql.org/;
+license=('custom:PostgreSQL')
+depends=(postgresql-libs=${_majorver} 'libxml2' 'openssl=1.0.0')
+source=(ftp://ftp.postgresql.org/pub/source/v${pkgver}/postgresql-${pkgver}.tar.bz2)
+
+build() {
+  cd ${srcdir}/postgresql-${pkgver}
+
+  ./configure --prefix=/opt/pgsql-${_majorver} \
+  --with-libxml --with-openssl --without-perl \
+  --without-python --with-pam --without-readline \
+  --with-system-tzdata=/usr/share/zoneinfo --disable-nls \
+  --enable-thread-safety
+
+  make -C src all
+}
+
+package() {
+  cd ${srcdir}/postgresql-${pkgver}
+
+  # install
+  make DESTDIR=${pkgdir} -C src install
+
+  # install license
+  install -D -m644 COPYRIGHT ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+
+  # clean up unneeded installed items
+  rm -rf ${pkgdir}/opt/pgsql-${_majorver}/include/
+}
+
+md5sums=('86816eb8a8513532957b96045abdfef9')
+sha256sums=('56d8ee809ceeabeae8461ae0a197943460cba5bf8fbe37324e4451cf2eb7d504')



[arch-commits] Commit in postgresql-old-upgrade/repos (4 files)

2011-09-26 Thread Dan McGee
Date: Monday, September 26, 2011 @ 16:47:05
  Author: dan
Revision: 138522

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  postgresql-old-upgrade/repos/testing-i686/PKGBUILD
(from rev 138521, postgresql-old-upgrade/trunk/PKGBUILD)
  postgresql-old-upgrade/repos/testing-x86_64/PKGBUILD
(from rev 138521, postgresql-old-upgrade/trunk/PKGBUILD)
Deleted:
  postgresql-old-upgrade/repos/testing-i686/PKGBUILD
  postgresql-old-upgrade/repos/testing-x86_64/PKGBUILD

-+
 testing-i686/PKGBUILD   |   82 +++---
 testing-x86_64/PKGBUILD |   82 +++---
 2 files changed, 82 insertions(+), 82 deletions(-)

Deleted: testing-i686/PKGBUILD
===
--- testing-i686/PKGBUILD   2011-09-26 20:42:13 UTC (rev 138521)
+++ testing-i686/PKGBUILD   2011-09-26 20:47:05 UTC (rev 138522)
@@ -1,41 +0,0 @@
-# $Id$
-# Maintainer: Dan McGee d...@archlinux.org
-
-pkgname=postgresql-old-upgrade
-pkgver=9.0.5
-_majorver=${pkgver%.*}
-pkgrel=1
-pkgdesc=Minimal PostgreSQL build for migrating between major versions with 
pg_upgrade
-arch=('i686' 'x86_64')
-url=http://www.postgresql.org/;
-license=('custom:PostgreSQL')
-depends=(postgresql-libs=${_majorver} 'libxml2' 'openssl=1.0.0')
-source=(ftp://ftp.postgresql.org/pub/source/v${pkgver}/postgresql-${pkgver}.tar.bz2)
-
-build() {
-  cd ${srcdir}/postgresql-${pkgver}
-
-  ./configure --prefix=/opt/pgsql-${_majorver} \
-  --with-libxml --with-openssl --without-perl \
-  --without-python --with-pam --without-readline \
-  --with-system-tzdata=/usr/share/zoneinfo --disable-nls \
-  --enable-thread-safety
-
-  make -C src all
-}
-
-package() {
-  cd ${srcdir}/postgresql-${pkgver}
-
-  # install
-  make DESTDIR=${pkgdir} -C src install
-
-  # install license
-  install -D -m644 COPYRIGHT ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-
-  # clean up unneeded installed items
-  rm -rf ${pkgdir}/opt/pgsql-${_majorver}/include/
-}
-
-md5sums=('86816eb8a8513532957b96045abdfef9')
-sha256sums=('56d8ee809ceeabeae8461ae0a197943460cba5bf8fbe37324e4451cf2eb7d504')

Copied: postgresql-old-upgrade/repos/testing-i686/PKGBUILD (from rev 138521, 
postgresql-old-upgrade/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2011-09-26 20:47:05 UTC (rev 138522)
@@ -0,0 +1,41 @@
+# $Id$
+# Maintainer: Dan McGee d...@archlinux.org
+
+pkgname=postgresql-old-upgrade
+pkgver=9.0.5
+_majorver=${pkgver%.*}
+pkgrel=1
+pkgdesc=Minimal PostgreSQL build for migrating between major versions with 
pg_upgrade
+arch=('i686' 'x86_64')
+url=http://www.postgresql.org/;
+license=('custom:PostgreSQL')
+depends=(postgresql-libs=${_majorver} 'libxml2' 'openssl=1.0.0')
+source=(ftp://ftp.postgresql.org/pub/source/v${pkgver}/postgresql-${pkgver}.tar.bz2)
+
+build() {
+  cd ${srcdir}/postgresql-${pkgver}
+
+  ./configure --prefix=/opt/pgsql-${_majorver} \
+  --with-libxml --with-openssl --without-perl \
+  --without-python --with-pam --without-readline \
+  --with-system-tzdata=/usr/share/zoneinfo --disable-nls \
+  --enable-thread-safety
+
+  make -C src all
+}
+
+package() {
+  cd ${srcdir}/postgresql-${pkgver}
+
+  # install
+  make DESTDIR=${pkgdir} -C src install
+
+  # install license
+  install -D -m644 COPYRIGHT ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+
+  # clean up unneeded installed items
+  rm -rf ${pkgdir}/opt/pgsql-${_majorver}/include/
+}
+
+md5sums=('86816eb8a8513532957b96045abdfef9')
+sha256sums=('56d8ee809ceeabeae8461ae0a197943460cba5bf8fbe37324e4451cf2eb7d504')

Deleted: testing-x86_64/PKGBUILD
===
--- testing-x86_64/PKGBUILD 2011-09-26 20:42:13 UTC (rev 138521)
+++ testing-x86_64/PKGBUILD 2011-09-26 20:47:05 UTC (rev 138522)
@@ -1,41 +0,0 @@
-# $Id$
-# Maintainer: Dan McGee d...@archlinux.org
-
-pkgname=postgresql-old-upgrade
-pkgver=9.0.5
-_majorver=${pkgver%.*}
-pkgrel=1
-pkgdesc=Minimal PostgreSQL build for migrating between major versions with 
pg_upgrade
-arch=('i686' 'x86_64')
-url=http://www.postgresql.org/;
-license=('custom:PostgreSQL')
-depends=(postgresql-libs=${_majorver} 'libxml2' 'openssl=1.0.0')
-source=(ftp://ftp.postgresql.org/pub/source/v${pkgver}/postgresql-${pkgver}.tar.bz2)
-
-build() {
-  cd ${srcdir}/postgresql-${pkgver}
-
-  ./configure --prefix=/opt/pgsql-${_majorver} \
-  --with-libxml --with-openssl --without-perl \
-  --without-python --with-pam --without-readline \
-  --with-system-tzdata=/usr/share/zoneinfo --disable-nls \
-  --enable-thread-safety
-
-  make -C src all
-}
-
-package() {
-  cd ${srcdir}/postgresql-${pkgver}
-
-  # install
-  make DESTDIR=${pkgdir} -C src install
-
-  # install license
-  install -D -m644 COPYRIGHT ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-
-  # clean up 

[arch-commits] Commit in postgresql/trunk (PKGBUILD postgresql postgresql.confd)

2011-09-26 Thread Dan McGee
Date: Monday, September 26, 2011 @ 16:58:47
  Author: dan
Revision: 138523

bashify init script, prepare for 9.1.1 release

Modified:
  postgresql/trunk/PKGBUILD
  postgresql/trunk/postgresql
  postgresql/trunk/postgresql.confd

--+
 PKGBUILD |   13 +++
 postgresql   |   62 -
 postgresql.confd |   17 +++---
 3 files changed, 47 insertions(+), 45 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-09-26 20:47:05 UTC (rev 138522)
+++ PKGBUILD2011-09-26 20:58:47 UTC (rev 138523)
@@ -3,7 +3,7 @@
 
 pkgbase=postgresql
 pkgname=('postgresql-libs' 'postgresql-docs' 'postgresql')
-pkgver=9.1.0
+pkgver=9.1.1
 _majorver=${pkgver%.*}
 pkgrel=1
 arch=('i686' 'x86_64')
@@ -118,8 +118,13 @@
 ${pkgdir}/etc/logrotate.d/postgresql
 }
 
-md5sums=('0497b9da1d7c380c340a9a87ba5500fe'
- '2bc5ca8d850d48fb3bb8a6d69832b6f9'
- 'bcde874133a2e07d160fb8f0b48bb842'
+md5sums=('061a9f17323117c9358ed60f33ecff78'
+ '4a6e9b63f2aa50195735f2b46aba040b'
+ '2bef962971bac882022c41a72efabb96'
  '96f82c38f3f540b53f3e5144900acf17'
  'd28e443f9f65a5712c52018b84e27137')
+sha256sums=('c794016bcf3fc1f561bc86796c6c9d050e3d8d2d55356515126e048275ae56f2'
+'b2931d7a719e765f14811b9109310b2418d3064bfcedef699573fc25854a2201'
+'92fe999c34824a9b8fe4b7212d58f60247e3d0514dd38807758eac64c4198190'
+'57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5'
+'6abb842764bbed74ea4a269d24f1e73d1c0b1d8ecd6e2e6fb5fb10590298605e')

Modified: postgresql
===
--- postgresql  2011-09-26 20:47:05 UTC (rev 138522)
+++ postgresql  2011-09-26 20:58:47 UTC (rev 138523)
@@ -7,70 +7,66 @@
 # Default PGROOT if it wasn't defined in the conf.d file
 PGROOT=${PGROOT:-/var/lib/postgres}
 PGLOG=${PGLOG:-/var/log/postgresql.log}
-PG_CTL=/usr/bin/pg_ctl -D \$PGROOT/data\ -l \$PGLOG\ -s -w
-if [ -n $PGOPTS ]; then
-PG_CTL=$PG_CTL -o \$PGOPTS\
-fi
+PGCTL_BIN=/usr/bin/pg_ctl
+PGCTL_ARGS=(-D $PGROOT/data -l $PGLOG -s -w)
+[[ $PGOPTS ]]  PGCTL_ARGS+=(-o $PGOPTS)
 
 postgres_init() {
 # initialization
-if [ ! -d $PGROOT/data ]; then
+if [[ ! -d $PGROOT/data ]]; then
 mkdir -p $PGROOT/data  chown -R postgres:postgres $PGROOT
-su - postgres -c /usr/bin/initdb $INITOPTS -D \$PGROOT/data\
+su - postgres -c /usr/bin/initdb $INITOPTS -D '$PGROOT/data'
 fi
-if [ ! -e $PGLOG ]; then
+if [[ ! -e $PGLOG ]]; then
 touch $PGLOG
 chown postgres $PGLOG
 fi
 }
 
-case $1 in
+do_postgres() {
+  su - postgres -c '$PGCTL_BIN' $(printf '%q ' ${PGCTL_ARGS[@]}) $@
+}
+
+case $1 in
   start)
 postgres_init
 stat_busy Starting PostgreSQL
-su - postgres -c \
- $PG_CTL start
-if [ $? -gt 0 ]; then
-  stat_fail
-  exit 1
-else
+if do_postgres start; then
   add_daemon postgresql
   stat_done
+else
+  stat_fail
+  exit 1
 fi
 ;;
   stop)
 stat_busy Stopping PostgreSQL
-su - postgres -c \
-  $PG_CTL stop -m fast
-if [ $? -gt 0 ]; then
-  stat_fail
-else
+if do_postgres stop -m fast; then
   rm_daemon postgresql
   stat_done
+else
+  stat_fail
+  exit 1
 fi
 ;;
   reload)
 stat_busy Reloading PostgreSQL
-su - postgres -c \
-  $PG_CTL reload
-if [ $? -gt 0 ]; then
+if do_postgres reload; then
+  stat_done
+else
   stat_fail
   exit 1
-else
-  stat_done
 fi
 ;;
   restart)
-postgres_init
+postgres_init
 stat_busy Restarting PostgreSQL
-su - postgres -c \
-  $PG_CTL restart -m fast
-if [ $? -gt 0 ]; then
-  stat_fail
-  exit 1
-else
+if do_postgres restart -m fast; then
   add_daemon postgresql
   stat_done
+else
+  stat_fail
+  exit 1
 fi
 ;;
   status)
@@ -78,6 +74,6 @@
 ck_status postgresql
 ;;
   *)
-echo usage: $0 {start|stop|reload|restart|status}  
+echo usage: $0 {start|stop|reload|restart|status}
+exit 1
 esac
-exit 0

Modified: postgresql.confd
===
--- postgresql.confd2011-09-26 20:47:05 UTC (rev 138522)
+++ postgresql.confd2011-09-26 20:58:47 UTC (rev 138523)
@@ -1,10 +1,11 @@
-#
-# Parameters to be passed to postgresql
-#
-PGROOT=/var/lib/postgres
-# Passed to initdb if necessary
-INITOPTS=--locale $LANG
-# Default log file location
+##
+## Parameters to be passed to postgresql
+##
+## Default data directory location
+#PGROOT=/var/lib/postgres
+## Passed to initdb if necessary
+#INITOPTS=--locale $LANG
+## Default log file location
 #PGLOG=/var/log/postgresql.log
-# Additional options to pass via pg_ctl's '-o' option
+## Additional options to pass via pg_ctl's '-o' option
 

[arch-commits] Commit in postgresql/trunk (PKGBUILD)

2011-09-26 Thread Dan McGee
Date: Monday, September 26, 2011 @ 17:29:03
  Author: dan
Revision: 138524

upgpkg: postgresql 9.1.1-1

major version bump 9.1.1

Modified:
  postgresql/trunk/PKGBUILD

--+
 PKGBUILD |5 +
 1 file changed, 5 insertions(+)

Modified: PKGBUILD
===
--- PKGBUILD2011-09-26 20:58:47 UTC (rev 138523)
+++ PKGBUILD2011-09-26 21:29:03 UTC (rev 138524)
@@ -75,6 +75,10 @@
 
   make -C doc/src/sgml DESTDIR=${pkgdir} install-html
   chown -R root:root ${pkgdir}/usr/share/doc/postgresql/html/
+
+  # clean up
+  rmdir ${pkgdir}/usr/share/man/man{1,3,7}
+  rmdir ${pkgdir}/usr/share/man
 }
 
 package_postgresql() {
@@ -103,6 +107,7 @@
   rm -rf ${pkgdir}/usr/include/postgresql/internal
   rm -rf ${pkgdir}/usr/include/libpq
   find ${pkgdir}/usr/include -maxdepth 1 -type f -execdir rm {} +
+  rmdir ${pkgdir}/usr/share/doc/postgresql/html
 
   # install launch script
   install -D -m755 ${srcdir}/postgresql ${pkgdir}/etc/rc.d/postgresql



[arch-commits] Commit in postgresql/repos (14 files)

2011-09-26 Thread Dan McGee
Date: Monday, September 26, 2011 @ 17:31:09
  Author: dan
Revision: 138525

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  postgresql/repos/testing-i686/
  postgresql/repos/testing-i686/PKGBUILD
(from rev 138524, postgresql/trunk/PKGBUILD)
  postgresql/repos/testing-i686/postgresql
(from rev 138524, postgresql/trunk/postgresql)
  postgresql/repos/testing-i686/postgresql.confd
(from rev 138524, postgresql/trunk/postgresql.confd)
  postgresql/repos/testing-i686/postgresql.install
(from rev 138524, postgresql/trunk/postgresql.install)
  postgresql/repos/testing-i686/postgresql.logrotate
(from rev 138524, postgresql/trunk/postgresql.logrotate)
  postgresql/repos/testing-i686/postgresql.pam
(from rev 138524, postgresql/trunk/postgresql.pam)
  postgresql/repos/testing-x86_64/
  postgresql/repos/testing-x86_64/PKGBUILD
(from rev 138524, postgresql/trunk/PKGBUILD)
  postgresql/repos/testing-x86_64/postgresql
(from rev 138524, postgresql/trunk/postgresql)
  postgresql/repos/testing-x86_64/postgresql.confd
(from rev 138524, postgresql/trunk/postgresql.confd)
  postgresql/repos/testing-x86_64/postgresql.install
(from rev 138524, postgresql/trunk/postgresql.install)
  postgresql/repos/testing-x86_64/postgresql.logrotate
(from rev 138524, postgresql/trunk/postgresql.logrotate)
  postgresql/repos/testing-x86_64/postgresql.pam
(from rev 138524, postgresql/trunk/postgresql.pam)

-+
 testing-i686/PKGBUILD   |  135 ++
 testing-i686/postgresql |   79 +++
 testing-i686/postgresql.confd   |   11 ++
 testing-i686/postgresql.install |   26 ++
 testing-i686/postgresql.logrotate   |4 +
 testing-i686/postgresql.pam |3 
 testing-x86_64/PKGBUILD |  135 ++
 testing-x86_64/postgresql   |   79 +++
 testing-x86_64/postgresql.confd |   11 ++
 testing-x86_64/postgresql.install   |   26 ++
 testing-x86_64/postgresql.logrotate |4 +
 testing-x86_64/postgresql.pam   |3 
 12 files changed, 516 insertions(+)

Copied: postgresql/repos/testing-i686/PKGBUILD (from rev 138524, 
postgresql/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2011-09-26 21:31:09 UTC (rev 138525)
@@ -0,0 +1,135 @@
+# $Id$
+# Maintainer: Dan McGee d...@archlinux.org
+
+pkgbase=postgresql
+pkgname=('postgresql-libs' 'postgresql-docs' 'postgresql')
+pkgver=9.1.1
+_majorver=${pkgver%.*}
+pkgrel=1
+arch=('i686' 'x86_64')
+url=http://www.postgresql.org/;
+license=('custom:PostgreSQL')
+makedepends=('libxml2' 'python2' 'perl' 'openssl=1.0.0')
+source=(ftp://ftp.postgresql.org/pub/source/v${pkgver}/postgresql-${pkgver}.tar.bz2
+postgresql postgresql.confd postgresql.pam postgresql.logrotate)
+
+build() {
+  cd ${srcdir}/postgresql-${pkgver}
+
+  ./configure --prefix=/usr --mandir=/usr/share/man \
+  --datadir=/usr/share/postgresql \
+  --with-libxml --with-openssl --with-perl \
+  --with-python PYTHON=/usr/bin/python2 --with-pam \
+  --with-system-tzdata=/usr/share/zoneinfo --enable-nls \
+  --enable-thread-safety
+
+  make world
+}
+
+package_postgresql-libs() {
+  pkgdesc=Libraries for use with PostgreSQL
+  depends=('openssl=1.0.0')
+  provides=('postgresql-client')
+  conflicts=('postgresql-client')
+
+  cd ${srcdir}/postgresql-${pkgver}
+
+  # install license
+  install -D -m644 COPYRIGHT 
${pkgdir}/usr/share/licenses/postgresql-libs/LICENSE
+
+  # install libs
+  for dir in src/interfaces src/bin/pg_config; do
+pushd ${dir}
+make DESTDIR=${pkgdir} install
+popd
+  done
+
+  install -D -m644 doc/src/sgml/man1/pg_config.1 
${pkgdir}/usr/share/man/man1/pg_config.1
+
+  cd src/include
+
+  mkdir -p ${pkgdir}/usr/include/{libpq,postgresql/internal/libpq}
+
+  # these headers are needed by the public headers of the interfaces
+  install -m644 pg_config.h ${pkgdir}/usr/include/
+  install -m644 pg_config_os.h ${pkgdir}/usr/include/
+  install -m644 postgres_ext.h ${pkgdir}/usr/include/
+  install -m644 libpq/libpq-fs.h ${pkgdir}/usr/include/libpq/
+  install -m644 pg_config_manual.h ${pkgdir}/usr/include/
+
+  # these headers are needed by the not-so-public headers of the interfaces
+  install -m644 c.h ${pkgdir}/usr/include/postgresql/internal/
+  install -m644 port.h ${pkgdir}/usr/include/postgresql/internal/
+  install -m644 postgres_fe.h ${pkgdir}/usr/include/postgresql/internal/
+  install -m644 libpq/pqcomm.h 
${pkgdir}/usr/include/postgresql/internal/libpq/
+}
+
+package_postgresql-docs() {
+  pkgdesc=HTML documentation for PostgreSQL
+  options=(docs)
+
+  cd ${srcdir}/postgresql-${pkgver}
+
+  # install license
+  install -D -m644 COPYRIGHT 
${pkgdir}/usr/share/licenses/postgresql-docs/LICENSE
+
+  make -C doc/src/sgml 

[arch-commits] Commit in postgresql/trunk (PKGBUILD)

2011-09-26 Thread Dan McGee
Date: Monday, September 26, 2011 @ 18:30:00
  Author: dan
Revision: 138526

Fix stupid overlapping files

Modified:
  postgresql/trunk/PKGBUILD

--+
 PKGBUILD |   19 +++
 1 file changed, 11 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-09-26 21:31:09 UTC (rev 138525)
+++ PKGBUILD2011-09-26 22:30:00 UTC (rev 138526)
@@ -5,7 +5,7 @@
 pkgname=('postgresql-libs' 'postgresql-docs' 'postgresql')
 pkgver=9.1.1
 _majorver=${pkgver%.*}
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url=http://www.postgresql.org/;
 license=('custom:PostgreSQL')
@@ -28,7 +28,7 @@
 
 package_postgresql-libs() {
   pkgdesc=Libraries for use with PostgreSQL
-  depends=('openssl=1.0.0')
+  depends=('openssl=1.0.0' 'readline=6.0')
   provides=('postgresql-client')
   conflicts=('postgresql-client')
 
@@ -38,13 +38,12 @@
   install -D -m644 COPYRIGHT 
${pkgdir}/usr/share/licenses/postgresql-libs/LICENSE
 
   # install libs
-  for dir in src/interfaces src/bin/pg_config; do
-pushd ${dir}
-make DESTDIR=${pkgdir} install
-popd
+  for dir in src/interfaces src/bin/pg_config src/bin/psql; do
+make -C ${dir} DESTDIR=${pkgdir} install
   done
 
   install -D -m644 doc/src/sgml/man1/pg_config.1 
${pkgdir}/usr/share/man/man1/pg_config.1
+  install -D -m644 doc/src/sgml/man1/psql.1 
${pkgdir}/usr/share/man/man1/psql.1
 
   cd src/include
 
@@ -96,9 +95,13 @@
   make DESTDIR=${pkgdir} install
   make -C contrib DESTDIR=${pkgdir} install
   make -C doc/src/sgml DESTDIR=${pkgdir} install-man
-  # we don't want this, it is in the -libs package
-  make -C src/bin/pg_config DESTDIR=${pkgdir} uninstall
+
+  # we don't want these, they are in the -libs package
+  for dir in src/interfaces src/bin/pg_config src/bin/psql; do
+make -C ${dir} DESTDIR=${pkgdir} uninstall
+  done
   rm ${pkgdir}/usr/share/man/man1/pg_config.1
+  rm ${pkgdir}/usr/share/man/man1/psql.1
 
   # install license
   install -D -m644 COPYRIGHT ${pkgdir}/usr/share/licenses/${pkgbase}/LICENSE



[arch-commits] Commit in krb5/trunk (PKGBUILD krb5-1.9.1-config-script.patch)

2011-09-26 Thread Stéphane Gaudreault
Date: Monday, September 26, 2011 @ 18:33:29
  Author: stephane
Revision: 138527

switch to patch I got from upstream

Modified:
  krb5/trunk/PKGBUILD
  krb5/trunk/krb5-1.9.1-config-script.patch

+
 PKGBUILD   |7 ---
 krb5-1.9.1-config-script.patch |   18 ++
 2 files changed, 14 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-09-26 22:30:00 UTC (rev 138526)
+++ PKGBUILD2011-09-26 22:33:29 UTC (rev 138527)
@@ -21,7 +21,7 @@
 sha1sums=('e23a1795a237521493da9cf3443ac8b98a90c066'
   '2aa229369079ed1bbb201a1ef72c47bf143f4dbe'
   '77d2312ecd8bf12a6e72cc8fd871a8ac93b23393'
-  '8d1ec8bdb39fec230caace112d1a41ad792f7d97')
+  '7342410760cf44bfa01bb99bb4c49e12496cb46f')
 options=('!emptydirs')
 
 build() {
@@ -30,12 +30,13 @@
 
# - Make krb5-config suppress CFLAGS output when called with --libs
#   cf https://bugzilla.redhat.com/show_bug.cgi?id=544391
-   #  
http://pkgs.fedoraproject.org/gitweb/?p=krb5.git;a=blob;f=krb5-1.7-buildconf.patch
#
# - Omit extra libraries because their interfaces are not exposed to 
applications
#   by libkrb5, unless do_deps is set to 1, which indicates that the caller
#   wants the whole list.
-   #   cf 
http://pkgs.fedoraproject.org/gitweb/?p=krb5.git;a=blob;f=krb5-1.7-nodeplibs.patch
+   #
+   #   Patch from upstream : 
+   #   
http://anonsvn.mit.edu/viewvc/krb5/trunk/src/krb5-config.in?r1=23662r2=25236
patch -Np2 -i ${srcdir}/krb5-1.9.1-config-script.patch
 
export CFLAGS+= -fPIC -fno-strict-aliasing -fstack-protector-all

Modified: krb5-1.9.1-config-script.patch
===
--- krb5-1.9.1-config-script.patch  2011-09-26 22:30:00 UTC (rev 138526)
+++ krb5-1.9.1-config-script.patch  2011-09-26 22:33:29 UTC (rev 138527)
@@ -1,25 +1,27 @@
 diff -Naur krb5-1.9.1.ori/src/krb5-config.in krb5-1.9.1/src/krb5-config.in
 --- krb5-1.9.1.ori/src/krb5-config.in  2010-01-19 13:44:57.0 -0500
-+++ krb5-1.9.1/src/krb5-config.in  2011-07-28 14:32:00.546990621 -0400
 krb5-1.9.1/src/krb5-config.in  2011-09-26 18:27:09.018487087 -0400
 @@ -186,7 +186,7 @@
-e 's#\$(RPATH_FLAG)#'$RPATH_FLAG'#' \
-e 's#\$(LDFLAGS)#'$LDFLAGS'#' \
-e 's#\$(PTHREAD_CFLAGS)#'$PTHREAD_CFLAGS'#' \
 -  -e 's#\$(CFLAGS)#'$CFLAGS'#'`
-+   -e 's#\$(CFLAGS)##'`
++  -e 's#\$(CFLAGS)##'`
  
  if test $library = 'kdb'; then
lib_flags=$lib_flags -lkdb5 $KDB5_DB_LIB
-@@ -214,7 +214,11 @@
+@@ -214,9 +214,13 @@
  fi
  
  if test $library = 'krb5'; then
 -  lib_flags=$lib_flags -lkrb5 -lk5crypto -lcom_err $GEN_LIB $LIBS 
$DL_LIB
-+   if test 0$do_deps -eq 1 ; then
-+  lib_flags=$lib_flags -lkrb5 -lk5crypto -lcom_err $GEN_LIB 
$LIBS $DL_LIB
-+   else
-+   lib_flags=$lib_flags -lkrb5 -lk5crypto -lcom_err
-+   fi
++  lib_flags=$lib_flags -lkrb5 -lk5crypto -lcom_err
  fi
  
++# If we ever support a flag to generate output suitable for static
++# linking, we would output -lkrb5support $GEN_LIB $LIBS $DL_LIB
++# here.
++
  echo $lib_flags
+ fi
+ 



[arch-commits] Commit in krb5/trunk (PKGBUILD krb5-1.9.1-canonicalize-fallback.patch)

2011-09-26 Thread Stéphane Gaudreault
Date: Monday, September 26, 2011 @ 18:50:55
  Author: stephane
Revision: 138529

Support old KDCs (FS#25515); Install aclocal file (FS#25384)

Added:
  krb5/trunk/krb5-1.9.1-canonicalize-fallback.patch
Modified:
  krb5/trunk/PKGBUILD

+
 PKGBUILD   |   13 +-
 krb5-1.9.1-canonicalize-fallback.patch |   58 +++
 2 files changed, 68 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-09-26 22:48:37 UTC (rev 138528)
+++ PKGBUILD2011-09-26 22:50:55 UTC (rev 138529)
@@ -3,7 +3,7 @@
 
 pkgname=krb5
 pkgver=1.9.1
-pkgrel=3
+pkgrel=4
 pkgdesc=The Kerberos network authentication system
 arch=('i686' 'x86_64')
 url=http://web.mit.edu/kerberos/;
@@ -17,11 +17,13 @@
 
source=(http://web.mit.edu/kerberos/dist/${pkgname}/1.9/${pkgname}-${pkgver}-signed.tar
 krb5-kadmind
 krb5-kdc
-krb5-1.9.1-config-script.patch)
+krb5-1.9.1-config-script.patch
+krb5-1.9.1-canonicalize-fallback.patch)
 sha1sums=('e23a1795a237521493da9cf3443ac8b98a90c066'
   '2aa229369079ed1bbb201a1ef72c47bf143f4dbe'
   '77d2312ecd8bf12a6e72cc8fd871a8ac93b23393'
-  '7342410760cf44bfa01bb99bb4c49e12496cb46f')
+  '7342410760cf44bfa01bb99bb4c49e12496cb46f'
+  '238c268fa6cb42fc7324ab54db9abda5cd77f833')
 options=('!emptydirs')
 
 build() {
@@ -39,6 +41,9 @@
#   
http://anonsvn.mit.edu/viewvc/krb5/trunk/src/krb5-config.in?r1=23662r2=25236
patch -Np2 -i ${srcdir}/krb5-1.9.1-config-script.patch
 
+   # Fix FS#25515
+   patch -Np2 -i ${srcdir}/krb5-1.9.1-canonicalize-fallback.patch
+
export CFLAGS+= -fPIC -fno-strict-aliasing -fstack-protector-all
export CPPFLAGS+= -I/usr/include/et
./configure --prefix=/usr \
@@ -70,5 +75,7 @@
install -m 755 ../../krb5-kdc ${pkgdir}/etc/rc.d
install -m 755 ../../krb5-kadmind  ${pkgdir}/etc/rc.d
 
+   install -m 644 util/ac_check_krb5.m4 ${pkgdir}/usr/share/aclocal
+
install -Dm644 ${srcdir}/${pkgname}-${pkgver}/NOTICE 
${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
 }

Added: krb5-1.9.1-canonicalize-fallback.patch
===
--- krb5-1.9.1-canonicalize-fallback.patch  (rev 0)
+++ krb5-1.9.1-canonicalize-fallback.patch  2011-09-26 22:50:55 UTC (rev 
138529)
@@ -0,0 +1,58 @@
+diff -Naur krb5-1.9.1.ori/src/lib/krb5/krb/get_creds.c 
krb5-1.9.1/src/lib/krb5/krb/get_creds.c
+--- krb5-1.9.1.ori/src/lib/krb5/krb/get_creds.c2011-02-09 
16:55:36.0 -0500
 krb5-1.9.1/src/lib/krb5/krb/get_creds.c2011-09-26 18:42:01.465190278 
-0400
+@@ -470,13 +470,10 @@
+ 
+ /* STATE_REFERRALS */
+ 
+-/*
+- * Possibly retry a request in the fallback realm after a referral request
+- * failure in the local realm.  Expects ctx-reply_code to be set to the error
+- * from a referral request.
+- */
++/* Possibly try a non-referral request after a referral request failure.
++ * Expects ctx-reply_code to be set to the error from a referral request. */
+ static krb5_error_code
+-try_fallback_realm(krb5_context context, krb5_tkt_creds_context ctx)
++try_fallback(krb5_context context, krb5_tkt_creds_context ctx)
+ {
+ krb5_error_code code;
+ char **hrealms;
+@@ -485,9 +482,10 @@
+ if (ctx-referral_count  1)
+ return ctx-reply_code;
+ 
+-/* Only fall back if the original request used the referral realm. */
++/* If the request used a specified realm, make a non-referral request to
++ * that realm (in case it's a KDC which rejects KDC_OPT_CANONICALIZE). */
+ if (!krb5_is_referral_realm(ctx-req_server-realm))
+-return ctx-reply_code;
++return begin_non_referral(context, ctx);
+ 
+ if (ctx-server-length  2) {
+ /* We need a type/host format principal to find a fallback realm. */
+@@ -500,10 +498,10 @@
+ if (code != 0)
+ return code;
+ 
+-/* Give up if the fallback realm isn't any different. */
++/* If the fallback realm isn't any different, use the existing TGT. */
+ if (data_eq_string(ctx-server-realm, hrealms[0])) {
+ krb5_free_host_realm(context, hrealms);
+-return ctx-reply_code;
++return begin_non_referral(context, ctx);
+ }
+ 
+ /* Rewrite server-realm to be the fallback realm. */
+@@ -540,9 +538,9 @@
+ krb5_error_code code;
+ const krb5_data *referral_realm;
+ 
+-/* Possibly retry with the fallback realm on error. */
++/* Possibly try a non-referral fallback request on error. */
+ if (ctx-reply_code != 0)
+-return try_fallback_realm(context, ctx);
++return try_fallback(context, ctx);
+ 
+ if (krb5_principal_compare(context, ctx-reply_creds-server,
+ctx-server)) {



[arch-commits] Commit in sed/trunk (PKGBUILD)

2011-09-26 Thread Allan McRae
Date: Monday, September 26, 2011 @ 23:13:59
  Author: allan
Revision: 138530

add check()

Modified:
  sed/trunk/PKGBUILD

--+
 PKGBUILD |5 +
 1 file changed, 5 insertions(+)

Modified: PKGBUILD
===
--- PKGBUILD2011-09-26 22:50:55 UTC (rev 138529)
+++ PKGBUILD2011-09-27 03:13:59 UTC (rev 138530)
@@ -22,6 +22,11 @@
   make
 }
 
+check() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make check
+}
+
 package() {
   cd ${srcdir}/${pkgname}-${pkgver}
   make DESTDIR=${pkgdir} install



[arch-commits] Commit in proftpd/trunk (PKGBUILD)

2011-09-26 Thread Eric Bélanger
Date: Monday, September 26, 2011 @ 23:17:08
  Author: eric
Revision: 138531

upgpkg: proftpd 1.3.3f-1

Upstream update, Clean up depends

Modified:
  proftpd/trunk/PKGBUILD

--+
 PKGBUILD |9 -
 1 file changed, 4 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-09-27 03:13:59 UTC (rev 138530)
+++ PKGBUILD2011-09-27 03:17:08 UTC (rev 138531)
@@ -4,18 +4,17 @@
 # Contributor: Daniel J Griffiths ghost1...@archlinux.us
 
 pkgname=proftpd
-pkgver=1.3.3e
-pkgrel=2
+pkgver=1.3.3f
+pkgrel=1
 pkgdesc=A high-performance, scalable FTP server
 arch=('i686' 'x86_64')
 url=http://www.proftpd.org;
 license=('GPL')
-depends=('glibc' 'pam' 'ncurses' 'libcap' 'libldap' 'libmysqlclient'
- 'postgresql-libs')
+depends=('libldap' 'libmysqlclient' 'postgresql-libs')
 backup=('etc/proftpd.conf' 'etc/conf.d/proftpd')
 source=(ftp://ftp.proftpd.org/distrib/source/${pkgname}-${pkgver}.tar.bz2;
 'proftpd' 'proftpd.logrotate' 'proftpd.conf.d')
-md5sums=('acc49b6589bc8c9fdf1dce9000bebdbd'
+md5sums=('e9416d2aa7ac1246af4fc8a80fd73f27'
  '99f6f9a989e70e3fa50809fc2b0a'
  'ddb09eb13131becdf0e081eef413116b'
  '71d5932b0461c318ed68c2c0c2660736')



[arch-commits] Commit in proftpd/repos (16 files)

2011-09-26 Thread Eric Bélanger
Date: Monday, September 26, 2011 @ 23:18:03
  Author: eric
Revision: 138532

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  proftpd/repos/extra-i686/PKGBUILD
(from rev 138531, proftpd/trunk/PKGBUILD)
  proftpd/repos/extra-i686/proftpd
(from rev 138531, proftpd/trunk/proftpd)
  proftpd/repos/extra-i686/proftpd.conf.d
(from rev 138531, proftpd/trunk/proftpd.conf.d)
  proftpd/repos/extra-i686/proftpd.logrotate
(from rev 138531, proftpd/trunk/proftpd.logrotate)
  proftpd/repos/extra-x86_64/PKGBUILD
(from rev 138531, proftpd/trunk/PKGBUILD)
  proftpd/repos/extra-x86_64/proftpd
(from rev 138531, proftpd/trunk/proftpd)
  proftpd/repos/extra-x86_64/proftpd.conf.d
(from rev 138531, proftpd/trunk/proftpd.conf.d)
  proftpd/repos/extra-x86_64/proftpd.logrotate
(from rev 138531, proftpd/trunk/proftpd.logrotate)
Deleted:
  proftpd/repos/extra-i686/PKGBUILD
  proftpd/repos/extra-i686/proftpd
  proftpd/repos/extra-i686/proftpd.conf.d
  proftpd/repos/extra-i686/proftpd.logrotate
  proftpd/repos/extra-x86_64/PKGBUILD
  proftpd/repos/extra-x86_64/proftpd
  proftpd/repos/extra-x86_64/proftpd.conf.d
  proftpd/repos/extra-x86_64/proftpd.logrotate

+
 extra-i686/PKGBUILD|  105 +++
 extra-i686/proftpd |   82 +++---
 extra-i686/proftpd.conf.d  |8 +-
 extra-i686/proftpd.logrotate   |   10 +--
 extra-x86_64/PKGBUILD  |  105 +++
 extra-x86_64/proftpd   |   82 +++---
 extra-x86_64/proftpd.conf.d|8 +-
 extra-x86_64/proftpd.logrotate |   10 +--
 8 files changed, 204 insertions(+), 206 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2011-09-27 03:17:08 UTC (rev 138531)
+++ extra-i686/PKGBUILD 2011-09-27 03:18:03 UTC (rev 138532)
@@ -1,53 +0,0 @@
-# $Id$
-# Maintainer:
-# Contributor: Eric Belanger e...@archlinux.org
-# Contributor: Daniel J Griffiths ghost1...@archlinux.us
-
-pkgname=proftpd
-pkgver=1.3.3e
-pkgrel=2
-pkgdesc=A high-performance, scalable FTP server
-arch=('i686' 'x86_64')
-url=http://www.proftpd.org;
-license=('GPL')
-depends=('glibc' 'pam' 'ncurses' 'libcap' 'libldap' 'libmysqlclient'
- 'postgresql-libs')
-backup=('etc/proftpd.conf' 'etc/conf.d/proftpd')
-source=(ftp://ftp.proftpd.org/distrib/source/${pkgname}-${pkgver}.tar.bz2;
-'proftpd' 'proftpd.logrotate' 'proftpd.conf.d')
-md5sums=('acc49b6589bc8c9fdf1dce9000bebdbd'
- '99f6f9a989e70e3fa50809fc2b0a'
- 'ddb09eb13131becdf0e081eef413116b'
- '71d5932b0461c318ed68c2c0c2660736')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  ./configure --prefix=/usr \
---mandir=/usr/share/man \
---disable-pam \
-
--with-modules=mod_quotatab:mod_quotatab_sql:mod_quotatab_file:mod_tls:mod_ldap:mod_sql:mod_sql_mysql:mod_sql_postgres
 \
---sysconfdir=/etc \
---localstatedir=/var/run \
---enable-ctrls \
---enable-ipv6 \
---with-includes=/usr/include/mysql:/usr/include/postgresql \
---with-libraries=/usr/lib/mysql:/usr/lib/postgresql \
---enable-nls
-
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  make DESTDIR=${pkgdir} install
-  install -Dm644 ../proftpd.logrotate ${pkgdir}/etc/logrotate.d/proftpd
-  install -Dm644 ../proftpd.conf.d ${pkgdir}/etc/conf.d/proftpd
-  install -Dm755 ../proftpd ${pkgdir}/etc/rc.d/proftpd
-  install -Dm755 contrib/xferstats.holger-preiss ${pkgdir}/usr/bin/ftpstats
-
-  cd ${pkgdir}/etc
-  sed -i 's|nogroup|nobody|g' proftpd.conf
-  rmdir ${pkgdir}/usr/libexec
-}

Copied: proftpd/repos/extra-i686/PKGBUILD (from rev 138531, 
proftpd/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2011-09-27 03:18:03 UTC (rev 138532)
@@ -0,0 +1,52 @@
+# $Id$
+# Maintainer:
+# Contributor: Eric Belanger e...@archlinux.org
+# Contributor: Daniel J Griffiths ghost1...@archlinux.us
+
+pkgname=proftpd
+pkgver=1.3.3f
+pkgrel=1
+pkgdesc=A high-performance, scalable FTP server
+arch=('i686' 'x86_64')
+url=http://www.proftpd.org;
+license=('GPL')
+depends=('libldap' 'libmysqlclient' 'postgresql-libs')
+backup=('etc/proftpd.conf' 'etc/conf.d/proftpd')
+source=(ftp://ftp.proftpd.org/distrib/source/${pkgname}-${pkgver}.tar.bz2;
+'proftpd' 'proftpd.logrotate' 'proftpd.conf.d')
+md5sums=('e9416d2aa7ac1246af4fc8a80fd73f27'
+ '99f6f9a989e70e3fa50809fc2b0a'
+ 'ddb09eb13131becdf0e081eef413116b'
+ '71d5932b0461c318ed68c2c0c2660736')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+
+  ./configure --prefix=/usr \
+--mandir=/usr/share/man \
+--disable-pam \
+
--with-modules=mod_quotatab:mod_quotatab_sql:mod_quotatab_file:mod_tls:mod_ldap:mod_sql:mod_sql_mysql:mod_sql_postgres
 \
+

[arch-commits] Commit in tzdata/repos (5 files)

2011-09-26 Thread andyrtr
Date: Tuesday, September 27, 2011 @ 00:34:23
  Author: andyrtr
Revision: 138533

db-move: moved tzdata from [testing] to [core] (i686)

Added:
  tzdata/repos/core-i686/Makefile.patch
(from rev 138532, tzdata/repos/testing-i686/Makefile.patch)
  tzdata/repos/core-i686/PKGBUILD
(from rev 138532, tzdata/repos/testing-i686/PKGBUILD)
Deleted:
  tzdata/repos/core-i686/Makefile.patch
  tzdata/repos/core-i686/PKGBUILD
  tzdata/repos/testing-i686/

+
 Makefile.patch |  280 +++
 PKGBUILD   |   93 +-
 2 files changed, 188 insertions(+), 185 deletions(-)

Deleted: core-i686/Makefile.patch
===
--- core-i686/Makefile.patch2011-09-27 03:18:03 UTC (rev 138532)
+++ core-i686/Makefile.patch2011-09-27 04:34:23 UTC (rev 138533)
@@ -1,140 +0,0 @@
-diff -Naur src/Makefile src-p/Makefile
 src/Makefile   2007-08-20 16:47:41.0 +0200
-+++ src-p/Makefile 2007-10-02 04:07:44.0 +0200
-@@ -34,17 +34,17 @@
- 
- # Everything gets put in subdirectories of. . .
- 
--TOPDIR=   /usr/local
-+TOPDIR=   $(DESTDIR)/usr
- 
- # Compiled time zone information is placed in the TZDIR directory
- # (and subdirectories).
- # Use an absolute path name for TZDIR unless you're just testing the software.
- 
--TZDIR=$(TOPDIR)/etc/zoneinfo
-+TZDIR=$(TOPDIR)/share/zoneinfo
- 
- # The tzselect, zic, and zdump commands get installed in. . .
- 
--ETCDIR=   $(TOPDIR)/etc
-+SBINDIR=  $(TOPDIR)/sbin
- 
- # If you make INSTALL, the date command gets installed in. . .
- 
-@@ -52,7 +52,7 @@
- 
- # Manual pages go in subdirectories of. . .
- 
--MANDIR=   $(TOPDIR)/man
-+MANDIR=   $(TOPDIR)/share/man
- 
- # Library functions are put in an archive in LIBDIR.
- 
-@@ -83,7 +83,7 @@
- 
- # Non-default libraries needed to link.
- # Add -lintl if you want to use `gettext' on Solaris.
--LDLIBS=
-+LDLIBS=$(LDFLAGS)
- 
- # Add the following to the end of the CFLAGS= line as needed.
- #  -Dconst= if `const' does not work (SunOS 4.x cc, OSF1 V5.0 cc)
-@@ -211,7 +211,7 @@
- # before the first Monday in January when a %V format is used and January 1
- # falls on a Friday, Saturday, or Sunday.
- 
--CFLAGS=
-+CFLAGS += -std=gnu99
- 
- # If you want zic's -s option used when installing, uncomment the next line
- # ZFLAGS= -s
-@@ -220,7 +220,7 @@
- ZIC=  $(zic) $(ZFLAGS)
- 
- # The name of a Posix-compliant `awk' on your system.
--AWK=  nawk
-+AWK=  awk
- 
- # The path where SGML DTDs are kept.
- SGML_SEARCH_PATH= $(TOPDIR)/share/doc/sgml-lib/REC-html401-19991224/
-@@ -241,8 +241,10 @@
- 
- 
###
- 
--cc=   cc
--CC=   $(cc) -DTZDIR=\$(TZDIR)\
-+CC+=  -DTZDIR=\$(TZDIR)\
-+ifeq ($(NLS),1)
-+CC += -DHAVE_GETTEXT=1 -DTZ_DOMAIN=\libc\
-+endif
- 
- TZCSRCS=  zic.c localtime.c asctime.c scheck.c ialloc.c
- TZCOBJS=  zic.o localtime.o asctime.o scheck.o ialloc.o
-@@ -282,14 +284,16 @@
- 
- ALL:  all date
- 
--install:  all $(DATA) $(REDO) $(TZLIB) $(MANS) $(TABDATA)
-+install:  all $(DATA) $(REDO) $(MANS) $(TABDATA)
-   $(ZIC) -y $(YEARISTYPE) \
-   -d $(TZDIR) -l $(LOCALTIME) -p $(POSIXRULES)
-   -rm -f $(TZDIR)/iso3166.tab $(TZDIR)/zone.tab
-   cp iso3166.tab zone.tab $(TZDIR)/.
--  -mkdir $(TOPDIR) $(ETCDIR)
--  cp tzselect zic zdump $(ETCDIR)/.
--  -mkdir $(TOPDIR) $(MANDIR) \
-+  -mkdir -p $(TOPDIR) $(SBINDIR)
-+  cp zic zdump $(SBINDIR)/.
-+  -mkdir -p $(TOPDIR) $(BINDIR)
-+  cp tzselect $(BINDIR)/.
-+  -mkdir -p $(TOPDIR) $(MANDIR) \
-   $(MANDIR)/man3 $(MANDIR)/man5 $(MANDIR)/man8
-   -rm -f $(MANDIR)/man3/newctime.3 \
-   $(MANDIR)/man3/newtzset.3 \
-@@ -298,13 +302,11 @@
-   $(MANDIR)/man8/zdump.8 \
-   $(MANDIR)/man8/zic.8
-   cp newctime.3 newtzset.3 $(MANDIR)/man3/.
--  cp tzfile.5 $(MANDIR)/man5/.
--  cp tzselect.8 zdump.8 zic.8 $(MANDIR)/man8/.
- 
- INSTALL:  ALL install date.1
--  -mkdir $(TOPDIR) $(BINDIR)
-+  -mkdir -p $(TOPDIR) $(BINDIR)
-   cp date $(BINDIR)/.
--  -mkdir $(TOPDIR) $(MANDIR) $(MANDIR)/man1
-+  -mkdir -p $(TOPDIR) $(MANDIR) $(MANDIR)/man1
-   -rm -f $(MANDIR)/man1/date.1
-   cp date.1 $(MANDIR)/man1/.
- 
-@@ -334,9 +336,9 @@
- # You must replace all of $(TZDIR) to switch from not using leap seconds
- # to using them, or vice versa.
- other_two:zic leapseconds $(TDATA)
--  $(ZIC) -y $(YEARISTYPE) -d $(TZDIR)-posix -L /dev/null $(TDATA)

[arch-commits] Commit in tzdata/repos (5 files)

2011-09-26 Thread andyrtr
Date: Tuesday, September 27, 2011 @ 00:34:24
  Author: andyrtr
Revision: 138534

db-move: moved tzdata from [testing] to [core] (x86_64)

Added:
  tzdata/repos/core-x86_64/Makefile.patch
(from rev 138532, tzdata/repos/testing-x86_64/Makefile.patch)
  tzdata/repos/core-x86_64/PKGBUILD
(from rev 138532, tzdata/repos/testing-x86_64/PKGBUILD)
Deleted:
  tzdata/repos/core-x86_64/Makefile.patch
  tzdata/repos/core-x86_64/PKGBUILD
  tzdata/repos/testing-x86_64/

+
 Makefile.patch |  280 +++
 PKGBUILD   |   93 +-
 2 files changed, 188 insertions(+), 185 deletions(-)

Deleted: core-x86_64/Makefile.patch
===
--- core-x86_64/Makefile.patch  2011-09-27 04:34:23 UTC (rev 138533)
+++ core-x86_64/Makefile.patch  2011-09-27 04:34:24 UTC (rev 138534)
@@ -1,140 +0,0 @@
-diff -Naur src/Makefile src-p/Makefile
 src/Makefile   2007-08-20 16:47:41.0 +0200
-+++ src-p/Makefile 2007-10-02 04:07:44.0 +0200
-@@ -34,17 +34,17 @@
- 
- # Everything gets put in subdirectories of. . .
- 
--TOPDIR=   /usr/local
-+TOPDIR=   $(DESTDIR)/usr
- 
- # Compiled time zone information is placed in the TZDIR directory
- # (and subdirectories).
- # Use an absolute path name for TZDIR unless you're just testing the software.
- 
--TZDIR=$(TOPDIR)/etc/zoneinfo
-+TZDIR=$(TOPDIR)/share/zoneinfo
- 
- # The tzselect, zic, and zdump commands get installed in. . .
- 
--ETCDIR=   $(TOPDIR)/etc
-+SBINDIR=  $(TOPDIR)/sbin
- 
- # If you make INSTALL, the date command gets installed in. . .
- 
-@@ -52,7 +52,7 @@
- 
- # Manual pages go in subdirectories of. . .
- 
--MANDIR=   $(TOPDIR)/man
-+MANDIR=   $(TOPDIR)/share/man
- 
- # Library functions are put in an archive in LIBDIR.
- 
-@@ -83,7 +83,7 @@
- 
- # Non-default libraries needed to link.
- # Add -lintl if you want to use `gettext' on Solaris.
--LDLIBS=
-+LDLIBS=$(LDFLAGS)
- 
- # Add the following to the end of the CFLAGS= line as needed.
- #  -Dconst= if `const' does not work (SunOS 4.x cc, OSF1 V5.0 cc)
-@@ -211,7 +211,7 @@
- # before the first Monday in January when a %V format is used and January 1
- # falls on a Friday, Saturday, or Sunday.
- 
--CFLAGS=
-+CFLAGS += -std=gnu99
- 
- # If you want zic's -s option used when installing, uncomment the next line
- # ZFLAGS= -s
-@@ -220,7 +220,7 @@
- ZIC=  $(zic) $(ZFLAGS)
- 
- # The name of a Posix-compliant `awk' on your system.
--AWK=  nawk
-+AWK=  awk
- 
- # The path where SGML DTDs are kept.
- SGML_SEARCH_PATH= $(TOPDIR)/share/doc/sgml-lib/REC-html401-19991224/
-@@ -241,8 +241,10 @@
- 
- 
###
- 
--cc=   cc
--CC=   $(cc) -DTZDIR=\$(TZDIR)\
-+CC+=  -DTZDIR=\$(TZDIR)\
-+ifeq ($(NLS),1)
-+CC += -DHAVE_GETTEXT=1 -DTZ_DOMAIN=\libc\
-+endif
- 
- TZCSRCS=  zic.c localtime.c asctime.c scheck.c ialloc.c
- TZCOBJS=  zic.o localtime.o asctime.o scheck.o ialloc.o
-@@ -282,14 +284,16 @@
- 
- ALL:  all date
- 
--install:  all $(DATA) $(REDO) $(TZLIB) $(MANS) $(TABDATA)
-+install:  all $(DATA) $(REDO) $(MANS) $(TABDATA)
-   $(ZIC) -y $(YEARISTYPE) \
-   -d $(TZDIR) -l $(LOCALTIME) -p $(POSIXRULES)
-   -rm -f $(TZDIR)/iso3166.tab $(TZDIR)/zone.tab
-   cp iso3166.tab zone.tab $(TZDIR)/.
--  -mkdir $(TOPDIR) $(ETCDIR)
--  cp tzselect zic zdump $(ETCDIR)/.
--  -mkdir $(TOPDIR) $(MANDIR) \
-+  -mkdir -p $(TOPDIR) $(SBINDIR)
-+  cp zic zdump $(SBINDIR)/.
-+  -mkdir -p $(TOPDIR) $(BINDIR)
-+  cp tzselect $(BINDIR)/.
-+  -mkdir -p $(TOPDIR) $(MANDIR) \
-   $(MANDIR)/man3 $(MANDIR)/man5 $(MANDIR)/man8
-   -rm -f $(MANDIR)/man3/newctime.3 \
-   $(MANDIR)/man3/newtzset.3 \
-@@ -298,13 +302,11 @@
-   $(MANDIR)/man8/zdump.8 \
-   $(MANDIR)/man8/zic.8
-   cp newctime.3 newtzset.3 $(MANDIR)/man3/.
--  cp tzfile.5 $(MANDIR)/man5/.
--  cp tzselect.8 zdump.8 zic.8 $(MANDIR)/man8/.
- 
- INSTALL:  ALL install date.1
--  -mkdir $(TOPDIR) $(BINDIR)
-+  -mkdir -p $(TOPDIR) $(BINDIR)
-   cp date $(BINDIR)/.
--  -mkdir $(TOPDIR) $(MANDIR) $(MANDIR)/man1
-+  -mkdir -p $(TOPDIR) $(MANDIR) $(MANDIR)/man1
-   -rm -f $(MANDIR)/man1/date.1
-   cp date.1 $(MANDIR)/man1/.
- 
-@@ -334,9 +336,9 @@
- # You must replace all of $(TZDIR) to switch from not using leap seconds
- # to using them, or vice versa.
- other_two:zic leapseconds $(TDATA)
--  $(ZIC) -y $(YEARISTYPE) -d $(TZDIR)-posix -L 

[arch-commits] Commit in sqlite3/repos (5 files)

2011-09-26 Thread andyrtr
Date: Tuesday, September 27, 2011 @ 00:34:25
  Author: andyrtr
Revision: 138535

db-move: moved sqlite3 from [testing] to [core] (i686)

Added:
  sqlite3/repos/core-i686/PKGBUILD
(from rev 138532, sqlite3/repos/testing-i686/PKGBUILD)
  sqlite3/repos/core-i686/license.txt
(from rev 138532, sqlite3/repos/testing-i686/license.txt)
Deleted:
  sqlite3/repos/core-i686/PKGBUILD
  sqlite3/repos/core-i686/license.txt
  sqlite3/repos/testing-i686/

-+
 PKGBUILD|  161 ++
 license.txt |   66 +++
 2 files changed, 119 insertions(+), 108 deletions(-)

Deleted: core-i686/PKGBUILD
===
--- core-i686/PKGBUILD  2011-09-27 04:34:24 UTC (rev 138534)
+++ core-i686/PKGBUILD  2011-09-27 04:34:25 UTC (rev 138535)
@@ -1,75 +0,0 @@
-# $Id$
-# Maintainer: Andreas Radke andy...@archlinux.org
-# Contributor: Tom Newsom jeeps...@gmx.co.uk
-
-pkgbase=sqlite3
-pkgname=('sqlite3' 'sqlite3-tcl' 'sqlite3-doc') 
-_amalgamationver=3070701
-_amalgamationver2=${_amalgamationver/00/}
-_docver=${_amalgamationver}#3070700
-pkgver=${_amalgamationver2//0/.}
-pkgrel=1
-pkgdesc=A C library that implements an SQL database engine
-arch=('i686' 'x86_64')
-license=('custom')
-url=http://www.sqlite.org/;
-makedepends=('tcl' 'readline=6.0.00')
-source=( # tarball containing the amalgamation for SQLite 3.7.5 together with 
a configure script and makefile for building it; includes now also the Tcl 
Extension Architecture (TEA)
-   http://www.sqlite.org/sqlite-autoconf-$_amalgamationver.tar.gz
-   #http://www.sqlite.org/sqlite-doc-${_amalgamationver}.zip
-   http://www.sqlite.org/sqlite-doc-${_docver}.zip
-   license.txt)
-options=('!libtool' '!emptydirs')
-md5sums=('554026fe7fac47b1cf61c18d5fe43419'
- '2bca5613abf9352bc525b6a8fd80156e'
- 'c1cdbc5544034d9012e421e75a5e4890')
-
-build() {
-  export CFLAGS=$CFLAGS -DSQLITE_ENABLE_FTS3=1 
-DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_ENABLE_UNLOCK_NOTIFY 
-DSQLITE_SECURE_DELETE
-
-  # build sqlite
-  cd $srcdir/sqlite-autoconf-$_amalgamationver
-  ./configure --prefix=/usr \
-   --disable-static
-  make
-  
-  # build the tcl extension
-  cd $srcdir/sqlite-autoconf-$_amalgamationver/tea
-  ./configure --prefix=/usr \
-   --with-system-sqlite
-  make
-
-}
-
-package_sqlite3() {
- 
- pkgdesc=A C library that implements an SQL database engine
- depends=('readline=6.0.00')
- conflicts=('sqlite')
- replaces=('sqlite')
- 
-  cd ${srcdir}/sqlite-autoconf-$_amalgamationver
-  make DESTDIR=${pkgdir} install
-  
-  # license
-  install -D -m644 ${srcdir}/license.txt 
${pkgdir}/usr/share/licenses/${pkgname}/license.txt
-}
-
-package_sqlite3-tcl() {
- 
- pkgdesc=sqlite3 Tcl Extension Architecture (TEA)
- depends=('sqlite3=3.7.5')
-
-  cd ${srcdir}/sqlite-autoconf-$_amalgamationver/tea
-  make DESTDIR=${pkgdir} install
-}
-
-package_sqlite3-doc() {
- pkgdesc=most of the static HTML files that comprise this website, including 
all of the SQL Syntax and the C/C++ interface specs and other miscellaneous 
documentation
- #arch=('any') - not yet supported
-
-  #cd ${srcdir}/sqlite-doc-${_amalgamationver}
-  cd ${srcdir}/sqlite-doc-${_docver}
-  mkdir -p ${pkgdir}/usr/share/doc/${pkgbase}
-  cp -R *  ${pkgdir}/usr/share/doc/${pkgbase}/
-}

Copied: sqlite3/repos/core-i686/PKGBUILD (from rev 138532, 
sqlite3/repos/testing-i686/PKGBUILD)
===
--- core-i686/PKGBUILD  (rev 0)
+++ core-i686/PKGBUILD  2011-09-27 04:34:25 UTC (rev 138535)
@@ -0,0 +1,86 @@
+# $Id$
+# Maintainer: Andreas Radke andy...@archlinux.org
+# Contributor: Tom Newsom jeeps...@gmx.co.uk
+
+pkgbase=sqlite3
+pkgname=('sqlite3' 'sqlite3-tcl' 'sqlite3-doc') 
+_amalgamationver=3070800
+_amalgamationver2=${_amalgamationver/00/}
+_docver=${_amalgamationver}#3070700
+pkgver=${_amalgamationver2//0/.}
+pkgrel=1
+pkgdesc=A C library that implements an SQL database engine
+arch=('i686' 'x86_64')
+license=('custom')
+url=http://www.sqlite.org/;
+makedepends=('tcl' 'readline=6.0.00')
+source=( # tarball containing the amalgamation for SQLite 3.7.5 together with 
a configure script and makefile for building it; includes now also the Tcl 
Extension Architecture (TEA)
+   http://www.sqlite.org/sqlite-autoconf-$_amalgamationver.tar.gz
+   #http://www.sqlite.org/sqlite-doc-${_amalgamationver}.zip
+   http://www.sqlite.org/sqlite-doc-${_docver}.zip
+   license.txt)
+options=('!libtool' '!emptydirs')
+md5sums=('6bfb46d73caaa1bbbcd2b52184b6c542'
+ '56c2e37c65075c612710ae1aba9703f2'
+ 'c1cdbc5544034d9012e421e75a5e4890')
+sha1sums=('34852cfd49ddea440eb26a35ad32deee0176a724'
+  'e8fec8ca866289477ea4249c219e07bc301d96c6'
+  'f34f6daa4ab3073d74e774aad21d66878cf26853')
+
+build() {
+  export CFLAGS=$CFLAGS -DSQLITE_ENABLE_FTS3=1 

[arch-commits] Commit in sqlite3/repos (5 files)

2011-09-26 Thread andyrtr
Date: Tuesday, September 27, 2011 @ 00:34:27
  Author: andyrtr
Revision: 138536

db-move: moved sqlite3 from [testing] to [core] (x86_64)

Added:
  sqlite3/repos/core-x86_64/PKGBUILD
(from rev 138532, sqlite3/repos/testing-x86_64/PKGBUILD)
  sqlite3/repos/core-x86_64/license.txt
(from rev 138532, sqlite3/repos/testing-x86_64/license.txt)
Deleted:
  sqlite3/repos/core-x86_64/PKGBUILD
  sqlite3/repos/core-x86_64/license.txt
  sqlite3/repos/testing-x86_64/

-+
 PKGBUILD|  161 ++
 license.txt |   66 +++
 2 files changed, 119 insertions(+), 108 deletions(-)

Deleted: core-x86_64/PKGBUILD
===
--- core-x86_64/PKGBUILD2011-09-27 04:34:25 UTC (rev 138535)
+++ core-x86_64/PKGBUILD2011-09-27 04:34:27 UTC (rev 138536)
@@ -1,75 +0,0 @@
-# $Id$
-# Maintainer: Andreas Radke andy...@archlinux.org
-# Contributor: Tom Newsom jeeps...@gmx.co.uk
-
-pkgbase=sqlite3
-pkgname=('sqlite3' 'sqlite3-tcl' 'sqlite3-doc') 
-_amalgamationver=3070701
-_amalgamationver2=${_amalgamationver/00/}
-_docver=${_amalgamationver}#3070700
-pkgver=${_amalgamationver2//0/.}
-pkgrel=1
-pkgdesc=A C library that implements an SQL database engine
-arch=('i686' 'x86_64')
-license=('custom')
-url=http://www.sqlite.org/;
-makedepends=('tcl' 'readline=6.0.00')
-source=( # tarball containing the amalgamation for SQLite 3.7.5 together with 
a configure script and makefile for building it; includes now also the Tcl 
Extension Architecture (TEA)
-   http://www.sqlite.org/sqlite-autoconf-$_amalgamationver.tar.gz
-   #http://www.sqlite.org/sqlite-doc-${_amalgamationver}.zip
-   http://www.sqlite.org/sqlite-doc-${_docver}.zip
-   license.txt)
-options=('!libtool' '!emptydirs')
-md5sums=('554026fe7fac47b1cf61c18d5fe43419'
- '2bca5613abf9352bc525b6a8fd80156e'
- 'c1cdbc5544034d9012e421e75a5e4890')
-
-build() {
-  export CFLAGS=$CFLAGS -DSQLITE_ENABLE_FTS3=1 
-DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_ENABLE_UNLOCK_NOTIFY 
-DSQLITE_SECURE_DELETE
-
-  # build sqlite
-  cd $srcdir/sqlite-autoconf-$_amalgamationver
-  ./configure --prefix=/usr \
-   --disable-static
-  make
-  
-  # build the tcl extension
-  cd $srcdir/sqlite-autoconf-$_amalgamationver/tea
-  ./configure --prefix=/usr \
-   --with-system-sqlite
-  make
-
-}
-
-package_sqlite3() {
- 
- pkgdesc=A C library that implements an SQL database engine
- depends=('readline=6.0.00')
- conflicts=('sqlite')
- replaces=('sqlite')
- 
-  cd ${srcdir}/sqlite-autoconf-$_amalgamationver
-  make DESTDIR=${pkgdir} install
-  
-  # license
-  install -D -m644 ${srcdir}/license.txt 
${pkgdir}/usr/share/licenses/${pkgname}/license.txt
-}
-
-package_sqlite3-tcl() {
- 
- pkgdesc=sqlite3 Tcl Extension Architecture (TEA)
- depends=('sqlite3=3.7.5')
-
-  cd ${srcdir}/sqlite-autoconf-$_amalgamationver/tea
-  make DESTDIR=${pkgdir} install
-}
-
-package_sqlite3-doc() {
- pkgdesc=most of the static HTML files that comprise this website, including 
all of the SQL Syntax and the C/C++ interface specs and other miscellaneous 
documentation
- #arch=('any') - not yet supported
-
-  #cd ${srcdir}/sqlite-doc-${_amalgamationver}
-  cd ${srcdir}/sqlite-doc-${_docver}
-  mkdir -p ${pkgdir}/usr/share/doc/${pkgbase}
-  cp -R *  ${pkgdir}/usr/share/doc/${pkgbase}/
-}

Copied: sqlite3/repos/core-x86_64/PKGBUILD (from rev 138532, 
sqlite3/repos/testing-x86_64/PKGBUILD)
===
--- core-x86_64/PKGBUILD(rev 0)
+++ core-x86_64/PKGBUILD2011-09-27 04:34:27 UTC (rev 138536)
@@ -0,0 +1,86 @@
+# $Id$
+# Maintainer: Andreas Radke andy...@archlinux.org
+# Contributor: Tom Newsom jeeps...@gmx.co.uk
+
+pkgbase=sqlite3
+pkgname=('sqlite3' 'sqlite3-tcl' 'sqlite3-doc') 
+_amalgamationver=3070800
+_amalgamationver2=${_amalgamationver/00/}
+_docver=${_amalgamationver}#3070700
+pkgver=${_amalgamationver2//0/.}
+pkgrel=1
+pkgdesc=A C library that implements an SQL database engine
+arch=('i686' 'x86_64')
+license=('custom')
+url=http://www.sqlite.org/;
+makedepends=('tcl' 'readline=6.0.00')
+source=( # tarball containing the amalgamation for SQLite 3.7.5 together with 
a configure script and makefile for building it; includes now also the Tcl 
Extension Architecture (TEA)
+   http://www.sqlite.org/sqlite-autoconf-$_amalgamationver.tar.gz
+   #http://www.sqlite.org/sqlite-doc-${_amalgamationver}.zip
+   http://www.sqlite.org/sqlite-doc-${_docver}.zip
+   license.txt)
+options=('!libtool' '!emptydirs')
+md5sums=('6bfb46d73caaa1bbbcd2b52184b6c542'
+ '56c2e37c65075c612710ae1aba9703f2'
+ 'c1cdbc5544034d9012e421e75a5e4890')
+sha1sums=('34852cfd49ddea440eb26a35ad32deee0176a724'
+  'e8fec8ca866289477ea4249c219e07bc301d96c6'
+  'f34f6daa4ab3073d74e774aad21d66878cf26853')
+
+build() {
+  export