xorg-fonts-75dpi: recompile ... plus killing a redundant jdk

4 files changed, 25 insertions, 86 deletions

diff --git a/abs/core/xorg-fonts-75dpi/PKGBUILD b/abs/core/xorg-fonts-75dpi/PKGBUILD
index 435c14f..0bca0e8 100644
--- a/abs/core/xorg-fonts-75dpi/PKGBUILD
+++ b/abs/core/xorg-fonts-75dpi/PKGBUILD
@@ -1,35 +1,41 @@
-# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $
+# $Id: PKGBUILD 71681 2010-03-08 12:06:26Z jgc $
 # Maintainer: Alexander Baldeck <alexander@archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 pkgname=xorg-fonts-75dpi
 pkgver=1.0.1
-pkgrel=2
+pkgrel=3
 pkgdesc="X.org 75dpi fonts"
-arch=(i686 x86_64)
+arch=(any)
 url="http://xorg.freedesktop.org/"
+license=('custom')
 depends=(xorg-fonts-encodings xorg-fonts-alias xorg-font-utils fontconfig)
 groups=('xorg')
 install=xfonts.install
-source=(${url}/releases/individual/font/font-adobe-75dpi-1.0.0.tar.bz2
-        ${url}/releases/individual/font/font-adobe-utopia-75dpi-1.0.1.tar.bz2
-        ${url}/releases/individual/font/font-bh-75dpi-1.0.0.tar.bz2
-        ${url}/releases/individual/font/font-bh-lucidatypewriter-75dpi-1.0.0.tar.bz2
-        ${url}/releases/individual/font/font-bitstream-75dpi-1.0.0.tar.bz2)
-md5sums=('813b5d3723c84388a938ab6732e1329c' 'dd912284e4750023f9682812532fa033'\
-         '6e51cd02f4ce32e1393e34ab17a9b211' 'fdd9be5b9db94ef363a33e39b7977e2b'\
-         'beb476657d50d07d17eef7c325a5ed08')
+source=(${url}/releases/individual/font/font-adobe-75dpi-1.0.1.tar.bz2
+        ${url}/releases/individual/font/font-adobe-utopia-75dpi-1.0.2.tar.bz2
+        ${url}/releases/individual/font/font-bh-75dpi-1.0.1.tar.bz2
+        ${url}/releases/individual/font/font-bh-lucidatypewriter-75dpi-1.0.1.tar.bz2
+        ${url}/releases/individual/font/font-bitstream-75dpi-1.0.1.tar.bz2)
+md5sums=('a47681c97bd012196691c95e34d400f1'
+         '71dffebeeb702d10876555c361fb69cf'
+         '53785d2688392aec5cba79fc0ddb23a2'
+         '6397062f2b346ce5bbe5472f3353a9a9'
+         'aed54fb53d2d24aff10c92985286d1e5')
 
 build() {
-  cd ${startdir}/src
-  for dir in font-*-75dpi-1.0.0 font-*-75dpi-1.0.1; do
-    pushd ${dir}
+  cd "${srcdir}"
+  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  for dir in *; do
+    if [ -d "${dir}" ]; then
+      pushd "${dir}"
       ./configure --prefix=/usr \
-                  --with-mapfiles=/usr/share/fonts/util \
-		  --with-fontdir=/usr/share/fonts/75dpi
+          --with-fontdir=/usr/share/fonts/75dpi || return 1
       make || return 1
-      make DESTDIR=${startdir}/pkg install || return 1
-    popd
+      make DESTDIR="${pkgdir}" install || return 1
+      install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.${dir%-75dpi-*}" || return 1
+      popd
+    fi
   done
-  rm -f ${startdir}/pkg/usr/share/fonts/75dpi/fonts.*
+  rm -f "${pkgdir}"/usr/share/fonts/75dpi/fonts.*
 }
 
diff --git a/abs/extra/community/jdk/PKGBUILD b/abs/extra/community/jdk/PKGBUILD
deleted file mode 100644
index 31924ce..0000000
--- a/abs/extra/community/jdk/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# Maintainer: Geoffroy Carrier <geoffroy.carrier@aur.archlinux.org>
-# Previous Maintainer: Jason Chu <jason@archlinux.org>
-pkgname=jdk
-pkgver=6u12
-pkgrel=1
-pkgdesc="Sun's Java Development Kit"
-arch=(i686 x86_64)
-  [ "${CARCH}" = "i686" ]   && ARCH=i586
-  [ "${CARCH}" = "x86_64" ] && ARCH=amd64
-url="http://java.sun.com"
-depends=('glibc' 'jre')
-install="jdk.install"
-source=(http://download.java.net/dlj/binaries/jdk-${pkgver}-dlj-linux-${ARCH}.bin
-        https://jdk-distros.dev.java.net/source/browse/*checkout*/jdk-distros/trunk/utils/construct.sh
-    	jdk.profile)
-[ "$CARCH" = "i686" ]   && md5sums=('560a51cfeecc4918d01ca29abc858d52'
-                                    '94065b612df0046d9ae758943f9f6a75'
-                                    '1e937a8bbca36330f730fc17663e3625')
-[ "$CARCH" = "x86_64" ] && md5sums=('0f687b6dbfe54e117bb0d9e090fda20b'
-                                    '94065b612df0046d9ae758943f9f6a75'
-                                    '1e937a8bbca36330f730fc17663e3625')
-replaces=('j2sdk')
-conflicts=('java-environment' 'j2sdk')
-provides=('java-environment' 'j2sdk')
-license=('custom')
-
-build() {
-  cd ${startdir}/src
-
-  mkdir unbundle-jdk
-  cd unbundle-jdk
-
-  sh ../jdk-${pkgver}-dlj-linux-${ARCH}.bin --accept-license
-
-  cd ..
-
-  sh construct.sh unbundle-jdk linux-jdk linux-jre
-
-  rm -rf linux-jdk/jre
-
-  mkdir -p ${startdir}/pkg/opt
-  mv linux-jdk ${startdir}/pkg/opt/java
-
-  install -D -m755 ${startdir}/src/${pkgname}.profile ${startdir}/pkg/etc/profile.d/${pkgname}.sh
-
-  mkdir -p $startdir/pkg/usr/share/licenses/jdk
-  cp $startdir/pkg/opt/java/COPYRIGHT $startdir/pkg/usr/share/licenses/jdk
-  cp $startdir/pkg/opt/java/LICENSE $startdir/pkg/usr/share/licenses/jdk
-  cp $startdir/pkg/opt/java/THIRDPARTYLICENSEREADME.txt $startdir/pkg/usr/share/licenses/jdk
-}
diff --git a/abs/extra/community/jdk/jdk.install b/abs/extra/community/jdk/jdk.install
deleted file mode 100644
index 6fb8be5..0000000
--- a/abs/extra/community/jdk/jdk.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_upgrade() {
-	post_install $1
-}
-
-post_install() {
-   echo "The jdk package is licensed software."
-   echo "You MUST read and agree to the license stored in"
-   echo "/opt/java/LICENSE before using it."
-					
-}
-
-op=$1
-shift
-$op $*
diff --git a/abs/extra/community/jdk/jdk.profile b/abs/extra/community/jdk/jdk.profile
deleted file mode 100644
index b39d49c..0000000
--- a/abs/extra/community/jdk/jdk.profile
+++ /dev/null
@@ -1,3 +0,0 @@
-export J2SDKDIR=/opt/java
-export PATH=$PATH:/opt/java/bin
-export JAVA_HOME=/opt/java