Merge branch 'testing' of knoppmyth.net:linhes_pkgbuild into testing

18 files changed, 396 insertions, 79 deletions

diff --git a/abs/core/fluxbox/PKGBUILD b/abs/core/fluxbox/PKGBUILD
index 3873ff1..cb52bed 100644
--- a/abs/core/fluxbox/PKGBUILD
+++ b/abs/core/fluxbox/PKGBUILD
@@ -16,7 +16,6 @@ source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkg
         fluxbox.desktop keys fluxbox_fullscreen_focus.patch)
 
 build() {
-  echo "==> Patching Fluxbox with fullscreen focus patch..."
   patch < fluxbox_fullscreen_focus.patch ${srcdir}/${pkgname}-${pkgver}/src/Window.cc || return 1
   cd ${srcdir}/${pkgname}-${pkgver}
   ./configure --prefix=/usr \
@@ -28,10 +27,10 @@ build() {
  # this is a fix to allow fluxbox to shutdown, but this can be changed by the user :-(
   sed -i 's|^.*slit\.autoHide.*$|session.screen0.slit.autoHide:  True|' ${pkgdir}/usr/share/fluxbox/init || return 1
   install -D -m644 ../fluxbox.desktop ${pkgdir}/etc/X11/sessions/fluxbox.desktop || return 1
-  install -D -m644 ../keys ${pkgdir}/usr/share/fluxbox/keys || return 1
+  install -D -m644 ../keys ${pkgdir}/usr/share/$pkgname/keys || return 1
   install -D -m644 COPYING ${pkgdir}/usr/share/licenses/$pkgname/COPYING || return 1
 }
 md5sums=('fa9fa8fe9a44f86522de5754f8b285ca'
          'eeae9c88a2526ac0bd8afcd9ce97f9ed'
-         'bb9f812c559263b4bf1d722628a11ca8'
-         '82dac089f2d42bb9592debc93291846d')
+         'b2c3340710b15fb82603dd5893bfb92f'
+         'd4b1195c78ac08ad41a678a424086420')
diff --git a/abs/core/fluxbox/__changelog b/abs/core/fluxbox/__changelog
new file mode 100644
index 0000000..f3f64c2
--- /dev/null
+++ b/abs/core/fluxbox/__changelog
@@ -0,0 +1,2 @@
+2/22/11 - chw - Added keys file.
+2/23/11 - chw - Added fullscreen patch.
diff --git a/abs/core/fluxbox/fluxbox-1.0.0-gcc43.patch b/abs/core/fluxbox/fluxbox-1.0.0-gcc43.patch
deleted file mode 100644
index 2e7db28..0000000
--- a/abs/core/fluxbox/fluxbox-1.0.0-gcc43.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- fluxbox-1.0.0-orig/src/main.cc	2007-08-11 14:22:20.000000000 -0400
-+++ fluxbox-1.0.0/src/main.cc	2008-05-05 15:14:59.000000000 -0400
-@@ -49,6 +49,7 @@
- #include <fstream>
- #include <stdexcept>
- #include <typeinfo>
-+#include <cstring>
- 
- using std::cout;
- using std::cerr;
diff --git a/abs/core/fluxbox/fluxbox_fullscreen_focus.patch b/abs/core/fluxbox/fluxbox_fullscreen_focus.patch
index 1a8c233..0e792dd 100644
--- a/abs/core/fluxbox/fluxbox_fullscreen_focus.patch
+++ b/abs/core/fluxbox/fluxbox_fullscreen_focus.patch
@@ -1,12 +1,15 @@
---- src/Window.cc.orig	2010-04-12 16:45:00.750585365 -0500
-+++ src/Window.cc	2010-04-12 16:45:38.719755786 -0500
-@@ -2042,8 +2042,7 @@
-     FluxboxWindow *cur = FocusControl::focusedFbWindow();
-     WinClient *client = FocusControl::focusedWindow();
-     if (ret && cur && getRootTransientFor(&from) != getRootTransientFor(client))
--        ret = !(cur->isFullscreen() && getOnHead() == cur->getOnHead()) &&
--              !cur->isTyping();
-+        ret = !cur->isTyping();
- 
-     if (!ret)
-         Fluxbox::instance()->attentionHandler().addAttention(from);
+--- /dev/null
++++ b/abs/core-testing/fluxbox/fluxbox_fullscreen_focus.patch
+@@ -0,0 +1,12 @@
++--- src/Window.cc.orig	2010-04-12 16:45:00.750585365 -0500
+++++ src/Window.cc	2010-04-12 16:45:38.719755786 -0500
++@@ -2042,8 +2042,7 @@
++     FluxboxWindow *cur = FocusControl::focusedFbWindow();
++     WinClient *client = FocusControl::focusedWindow();
++     if (ret && cur && getRootTransientFor(&from) != getRootTransientFor(client))
++-        ret = !(cur->isFullscreen() && getOnHead() == cur->getOnHead()) &&
++-              !cur->isTyping();
+++        ret = !cur->isTyping();
++ 
++     if (!ret)
++         Fluxbox::instance()->attentionHandler().addAttention(from);
diff --git a/abs/core/fluxbox/keys b/abs/core/fluxbox/keys
index d0091eb..85b6fd1 100644
--- a/abs/core/fluxbox/keys
+++ b/abs/core/fluxbox/keys
@@ -1,3 +1,14 @@
+!mouse actions added by fluxbox-update_configs
+OnTitlebar Mouse2 :StartTabbing
+
+!mouse actions added by fluxbox-update_configs
+OnTitlebar Double Mouse1 :Shade
+OnTitlebar Mouse3 :WindowMenu
+
+!mouse actions added by fluxbox-update_configs
+OnWindow Mod1 Mouse1 :MacroCmd {Raise} {Focus} {StartMoving}
+OnWindow Mod1 Mouse3 :MacroCmd {Raise} {Focus} {StartResizing BottomRight}
+
 OnDesktop Mouse1 :HideMenus
 OnDesktop Mouse2 :WorkspaceMenu
 OnDesktop Mouse3 :RootMenu
@@ -27,3 +38,4 @@ Mod1 3 :ExecCommand sudo sv restart mythbackend
 Mod1 h :ExecCommand MythVantage -h
 Mod1 Control u :ExecCommand /usr/LH/bin/unclutter-toggle.sh 
 Mod1 Escape :GotoWindow {1}
+
diff --git a/abs/core/iproute2/PKGBUILD b/abs/core/iproute2/PKGBUILD
index deb10fa..fa31f11 100644
--- a/abs/core/iproute2/PKGBUILD
+++ b/abs/core/iproute2/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 96235 2010-10-19 13:01:29Z allan $
+# $Id: PKGBUILD 107230 2011-01-22 18:51:34Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Judd Vinet <jvinet@zeroflux.org>
 
 pkgname=iproute2
-pkgver=2.6.35
-pkgrel=4
+pkgver=2.6.37
+pkgrel=1
 pkgdesc="IP Routing Utilities"
 arch=('i686' 'x86_64')
 license=('GPL2')
@@ -17,10 +17,9 @@ options=('!makeflags')
 backup=('etc/iproute2/ematch_map' 'etc/iproute2/rt_dsfield' 'etc/iproute2/rt_protos' \
 	'etc/iproute2/rt_realms' 'etc/iproute2/rt_scopes' 'etc/iproute2/rt_tables')
 source=(http://devresources.linux-foundation.org/dev/iproute2/download/iproute2-${pkgver}.tar.bz2
-	'iproute2-fhs.patch' 'iproutegetfix.patch')
-sha1sums=('862b86ac73ea696867675765d119654553a22aeb'
-          '2416b11252364d7a6c742eabb4a6924a75637a46'
-          'cd8c969800a9bd1d4ebba0e1eae69d0892786d60')
+	'iproute2-fhs.patch')
+sha1sums=('7852fb66fb745dc3c1fabee24d7d8ff017c48d36'
+          '2416b11252364d7a6c742eabb4a6924a75637a46')
 
 build() {
   cd $srcdir/iproute2-${pkgver}
@@ -28,18 +27,15 @@ build() {
   # set correct fhs structure
   patch -Np1 -i ${srcdir}/iproute2-fhs.patch
 
-  # fix ip route get breakage
-  patch -Np0 -i ${srcdir}/iproutegetfix.patch
-
   ./configure
 
-  make || return 1
+  make
 }
 
 package() {
   cd $srcdir/iproute2-${pkgver}
 
-  make DESTDIR=$pkgdir install || return 1
+  make DESTDIR=$pkgdir install
 
   # libnetlink isn't installed, install it FS#19385
   install -Dm644 include/libnetlink.h ${pkgdir}/usr/include/libnetlink.h
diff --git a/abs/extra/community/chromium/PKGBUILD b/abs/extra/community/chromium/PKGBUILD
new file mode 100644
index 0000000..f844692
--- /dev/null
+++ b/abs/extra/community/chromium/PKGBUILD
@@ -0,0 +1,111 @@
+# $Id: PKGBUILD 109507 2011-02-10 15:37:06Z ibiru $
+# Contributor: Pierre Schmitz <pierre@archlinux.de>
+# Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
+# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
+
+pkgname=chromium
+pkgver=9.0.597.94
+pkgrel=1
+pkgdesc='The open-source project behind Google Chrome, an attempt at creating a safer, faster, and more stable browser.'
+arch=('i686' 'x86_64')
+url='http://www.chromium.org/'
+license=('BSD')
+depends=('nss' 'gconf' 'alsa-lib' 'xdg-utils' 'hicolor-icon-theme' 'bzip2' 'libevent' 'libxss' 'libxtst' 'ttf-dejavu')
+makedepends=('python2' 'perl' 'gperf' 'yasm' 'mesa' 'libgnome-keyring' 'libcups')
+provides=('chromium-browser')
+conflicts=('chromium-browser')
+install=chromium.install
+source=("http://build.chromium.org/buildbot/official/chromium-${pkgver}.tar.bz2"
+        'chromium.desktop' 'chromium.sh')
+md5sums=('41386b3df743575f2325c4c64d6d7bc7'
+         'c5e849fcb1101149977355c99d8ff78f'
+         '096a46ef386817988250d2d7bddd1b34')
+
+build() {
+  cd ${srcdir}/chromium-${pkgver}
+
+### Configure
+
+  echo 'Use python2 instead of python...'
+  find . -type f -exec \
+	sed -E 's#(/usr/bin/python)$#\12#g;s#(/usr/bin/python2)\.4$#\1#g' -i {} \;
+  # There are still a lot of relative calls which need a workaround
+  mkdir ${srcdir}/python2-path
+  ln -s /usr/bin/python2 ${srcdir}/python2-path/python
+  export PATH="${srcdir}/python2-path/:${PATH}"
+
+  # we need to disable system_ssl until "next protocol negotiation" support
+  # is available in our nss package
+  # see https://bugzilla.mozilla.org/show_bug.cgi?id=547312
+
+  build/gyp_chromium -f make build/all.gyp --depth=. \
+    -Dgcc_version=45 \
+    -Dno_strict_aliasing=1 \
+    -Dwerror= \
+    -Dlinux_sandbox_path=/usr/lib/chromium/chromium-sandbox \
+    -Dlinux_strip_binary=1 \
+    -Drelease_extra_cflags="${CFLAGS}" \
+    -Dffmpeg_branding=Chrome \
+    -Dproprietary_codecs=1 \
+    -Duse_system_libjpeg=1 \
+    -Duse_system_libxslt=0 \
+    -Duse_system_libxml=0 \
+    -Duse_system_bzip2=1 \
+    -Duse_system_zlib=1 \
+    -Duse_system_libpng=1 \
+    -Duse_system_ffmpeg=0 \
+    -Duse_system_yasm=1 \
+    -Duse_system_libevent=1 \
+    -Duse_system_ssl=0 \
+    $([ "${CARCH}" == 'i686' ] && echo '-Ddisable_sse2=1')
+
+### Build
+
+  make chrome chrome_sandbox BUILDTYPE=Release
+}
+
+package() {
+  cd ${srcdir}/chromium-${pkgver}
+
+  install -m 0755 -D out/Release/chrome ${pkgdir}/usr/lib/chromium/chromium
+
+  install -m 4555 -o root -g root -D out/Release/chrome_sandbox \
+    ${pkgdir}/usr/lib/chromium/chromium-sandbox
+
+  install -m 0644 -D out/Release/chrome.pak \
+    ${pkgdir}/usr/lib/chromium/chrome.pak
+
+  install -m 0644 -D out/Release/resources.pak \
+    ${pkgdir}/usr/lib/chromium/resources.pak
+
+  install -m 0755 -D out/Release/libffmpegsumo.so \
+    ${pkgdir}/usr/lib/chromium/libffmpegsumo.so
+
+# these links are only needed when building with system ffmpeg
+#  ln -s /usr/lib/libavcodec.so.52 ${pkgdir}/usr/lib/chromium/
+#  ln -s /usr/lib/libavformat.so.52 ${pkgdir}/usr/lib/chromium/
+#  ln -s /usr/lib/libavutil.so.50 ${pkgdir}/usr/lib/chromium/
+
+  cp -a out/Release/locales out/Release/resources \
+    ${pkgdir}/usr/lib/chromium/
+
+  find ${pkgdir}/usr/lib/chromium/ -name '*.d' -type f -delete
+
+  install -m 0644 -D out/Release/chrome.1 \
+    ${pkgdir}/usr/share/man/man1/chromium.1
+
+  install -m 0644 -D ${srcdir}/chromium.desktop \
+    ${pkgdir}/usr/share/applications/chromium.desktop
+
+  for size in 16 22 24 32 48 64 128 256; do
+    install -m 0644 -D \
+      chrome/app/theme/chromium/product_logo_${size}.png \
+      ${pkgdir}/usr/share/icons/hicolor/${size}x${size}/apps/chromium.png
+  done
+
+  install -m 0755 -D ${srcdir}/chromium.sh ${pkgdir}/usr/bin/chromium
+
+  install -m 0644 -D LICENSE ${pkgdir}/usr/share/licenses/chromium/LICENSE
+}
+
+# vim:set sw=2 sts=2 et:
diff --git a/abs/extra/community/chromium/chromium.desktop b/abs/extra/community/chromium/chromium.desktop
new file mode 100644
index 0000000..4bb6981
--- /dev/null
+++ b/abs/extra/community/chromium/chromium.desktop
@@ -0,0 +1,113 @@
+[Desktop Entry]
+Version=1.0
+Name=Chromium
+# Only KDE 4 seems to use GenericName, so we reuse the KDE strings.
+# From Ubuntu's language-pack-kde-XX-base packages, version 9.04-20090413.
+GenericName=Web Browser
+GenericName[ar]=متصفح الشبكة
+GenericName[bg]=Уеб браузър
+GenericName[ca]=Navegador web
+GenericName[cs]=WWW prohlížeč
+GenericName[da]=Browser
+GenericName[de]=Web-Browser
+GenericName[el]=Περιηγητής ιστού
+GenericName[en_GB]=Web Browser
+GenericName[es]=Navegador web
+GenericName[et]=Veebibrauser
+GenericName[fi]=WWW-selain
+GenericName[fr]=Navigateur Web
+GenericName[gu]=વેબ બ્રાઉઝર
+GenericName[he]=דפדפן אינטרנט
+GenericName[hi]=वेब ब्राउज़र
+GenericName[hu]=Webböngésző
+GenericName[it]=Browser Web
+GenericName[ja]=ウェブブラウザ
+GenericName[kn]=ಜಾಲ ವೀಕ್ಷಕ
+GenericName[ko]=웹 브라우저
+GenericName[lt]=Žiniatinklio naršyklė
+GenericName[lv]=Tīmekļa pārlūks
+GenericName[ml]=വെബ് ബ്രൌസര്‍
+GenericName[mr]=वेब ब्राऊजर
+GenericName[nb]=Nettleser
+GenericName[nl]=Webbrowser
+GenericName[pl]=Przeglądarka WWW
+GenericName[pt]=Navegador Web
+GenericName[pt_BR]=Navegador da Internet
+GenericName[ro]=Navigator de Internet
+GenericName[ru]=Веб-браузер
+GenericName[sl]=Spletni brskalnik
+GenericName[sv]=Webbläsare
+GenericName[ta]=இணைய உலாவி
+GenericName[th]=เว็บเบราว์เซอร์
+GenericName[tr]=Web Tarayıcı
+GenericName[uk]=Навігатор Тенет
+GenericName[zh_CN]=网页浏览器
+GenericName[zh_HK]=網頁瀏覽器
+GenericName[zh_TW]=網頁瀏覽器
+# Not translated in KDE, from Epiphany 2.26.1-0ubuntu1.
+GenericName[bn]=ওয়েব ব্রাউজার
+GenericName[fil]=Web Browser
+GenericName[hr]=Web preglednik
+GenericName[id]=Browser Web
+GenericName[or]=ଓ୍ବେବ ବ୍ରାଉଜର
+GenericName[sk]=WWW prehliadač
+GenericName[sr]=Интернет прегледник
+GenericName[te]=మహాతల అన్వేషి
+GenericName[vi]=Bộ duyệt Web
+# Gnome and KDE 3 uses Comment.
+Comment=Access the Internet
+Comment[ar]=الدخول إلى الإنترنت
+Comment[bg]=Достъп до интернет
+Comment[bn]=ইন্টারনেটটি অ্যাক্সেস করুন
+Comment[ca]=Accedeix a Internet
+Comment[cs]=Přístup k internetu
+Comment[da]=Få adgang til internettet
+Comment[de]=Internetzugriff
+Comment[el]=Πρόσβαση στο Διαδίκτυο
+Comment[en_GB]=Access the Internet
+Comment[es]=Accede a Internet.
+Comment[et]=Pääs Internetti
+Comment[fi]=Käytä internetiä
+Comment[fil]=I-access ang Internet
+Comment[fr]=Accéder à Internet
+Comment[gu]=ઇંટરનેટ ઍક્સેસ કરો
+Comment[he]=גישה אל האינטרנט
+Comment[hi]=इंटरनेट तक पहुंच स्थापित करें
+Comment[hr]=Pristup Internetu
+Comment[hu]=Internetelérés
+Comment[id]=Akses Internet
+Comment[it]=Accesso a Internet
+Comment[ja]=インターネットにアクセス
+Comment[kn]=ಇಂಟರ್ನೆಟ್ ಅನ್ನು ಪ್ರವೇಶಿಸಿ
+Comment[ko]=인터넷 연결
+Comment[lt]=Interneto prieiga
+Comment[lv]=Piekļūt internetam
+Comment[ml]=ഇന്റര്‍‌നെറ്റ് ആക്‌സസ് ചെയ്യുക
+Comment[mr]=इंटरनेटमध्ये प्रवेश करा
+Comment[nb]=Gå til Internett
+Comment[nl]=Verbinding maken met internet
+Comment[or]=ଇଣ୍ଟର୍ନେଟ୍ ପ୍ରବେଶ କରନ୍ତୁ
+Comment[pl]=Skorzystaj z internetu
+Comment[pt]=Aceder à Internet
+Comment[pt_BR]=Acessar a internet
+Comment[ro]=Accesaţi Internetul
+Comment[ru]=Доступ в Интернет
+Comment[sk]=Prístup do siete Internet
+Comment[sl]=Dostop do interneta
+Comment[sr]=Приступите Интернету
+Comment[sv]=Gå ut på Internet
+Comment[ta]=இணையத்தை அணுகுதல்
+Comment[te]=ఇంటర్నెట్‌ను ఆక్సెస్ చెయ్యండి
+Comment[th]=เข้าถึงอินเทอร์เน็ต
+Comment[tr]=İnternet'e erişin
+Comment[uk]=Доступ до Інтернету
+Comment[vi]=Truy cập Internet
+Comment[zh_CN]=访问互联网
+Comment[zh_HK]=連線到網際網路
+Comment[zh_TW]=連線到網際網路
+Exec=chromium %U
+Terminal=false
+Icon=chromium
+Type=Application
+Categories=GTK;Network;WebBrowser;
+MimeType=text/html;text/xml;application/xhtml_xml;
diff --git a/abs/extra/community/chromium/chromium.install b/abs/extra/community/chromium/chromium.install
new file mode 100644
index 0000000..e70c054
--- /dev/null
+++ b/abs/extra/community/chromium/chromium.install
@@ -0,0 +1,11 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
diff --git a/abs/extra/community/chromium/chromium.sh b/abs/extra/community/chromium/chromium.sh
new file mode 100755
index 0000000..e1c3388
--- /dev/null
+++ b/abs/extra/community/chromium/chromium.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+export CHROME_WRAPPER=/usr/lib/chromium/chromium
+export CHROME_DESKTOP=chromium.desktop
+exec /usr/lib/chromium/chromium "$@"
diff --git a/abs/extra/community/flashplugin-prerelease/PKGBUILD b/abs/extra/community/flashplugin-prerelease/PKGBUILD
deleted file mode 100644
index d6eca0b..0000000
--- a/abs/extra/community/flashplugin-prerelease/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# Contributor : Anish Bhatt <anish[removethis][at]gatech[dot]edu>
-
-pkgname=flashplugin-prerelease
-_licensefile='Reader_Player_AIR_WWEULA-Combined-20080204_1313.pdf'
-pkgver=10.1.51.66
-pkgrel=1
-source=('http://download.macromedia.com/pub/labs/flashplayer10/flashplayer10_1_p2_linux_121709.tar.gz'
-	"http://www.adobe.com/products/eulas/pdfs/${_licensefile}")
-md5sums=('4f56f8235cb72a59d04d64ca4bd442b3'
-	'1636037610ee2aa35c5fb736a697b7e0')
-
-pkgdesc='Adobe Flash Player Prerelease'
-url='http://labs.adobe.com/technologies/flashplayer10/'
-arch=('i686')
-depends=('mozilla-common' 'libxt' 'gtk2' 'nss' 'curl')
-conflicts=('flashplugin')
-provides=('flashplayer')
-license=('custom')
-
-build() {
-  install -d -m755 ${pkgdir}/usr/lib/mozilla/plugins/ || return 1
-  if [ "${CARCH}" = 'i686' ]; then
-    install -m755 ${srcdir}/install_flash_player_10_linux/libflashplayer.so ${pkgdir}/usr/lib/mozilla/plugins/ || return 1
-  fi
-  install -d -m755 ${pkgdir}/usr/share/licenses/${pkgname}/ || return 1
-  install -m644 "${_licensefile}" ${pkgdir}/usr/share/licenses/${pkgname}/ || return 1
-}
-
diff --git a/abs/extra/community/flashplugin/PKGBUILD b/abs/extra/community/flashplugin/PKGBUILD
index 7d7e65f..e14790f 100644
--- a/abs/extra/community/flashplugin/PKGBUILD
+++ b/abs/extra/community/flashplugin/PKGBUILD
@@ -1,27 +1,36 @@
-# $Id: PKGBUILD 60911 2009-12-09 11:51:09Z andrea $
+# $Id$
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=flashplugin
 _licensefile='Reader_Player_AIR_WWEULA-Combined-20080204_1313.pdf'
-pkgver=10.1.53.64
-pkgrel=1
+pkgver=10.2.152.27
+_pkgver64=10.0.45.2
+pkgrel=4
 pkgdesc='Adobe Flash Player'
 url='http://get.adobe.com/flashplayer'
-arch=('i686' 'x86_64')
+arch=('i686') # 'x86_64')
 depends=('mozilla-common' 'libxt' 'gtk2' 'nss' 'curl')
+optdepends=('libvdpau: GPU acceleration on Nvidia card')
 replaces=('flashplugin-beta')
 provides=('flashplayer')
 license=('custom')
+options=(!strip)
+install=flashplugin.install
+backup=(etc/adobe/mms.cfg)
 source=('http://fpdownload.macromedia.com/get/flashplayer/current/install_flash_player_10_linux.tar.gz'
-        "http://www.adobe.com/products/eulas/pdfs/${_licensefile}")
-[ "${CARCH}" = "x86_64" ] && source[0]="http://download.macromedia.com/pub/labs/flashplayer10/libflashplayer-${pkgver}.linux-${CARCH}.so.tar.gz"
-[ "${CARCH}" = "x86_64" ] && md5sums[0]='8b427c2991c0447af56a951c653ee383'
+        "http://www.adobe.com/products/eulas/pdfs/${_licensefile}"
+         mms.cfg)
+#[ "${CARCH}" = "x86_64" ] && source[0]="http://download.macromedia.com/pub/labs/flashplayer10/libflashplayer-${_pkgver64}.linux-${CARCH}.so.tar.gz"
+#[ "${CARCH}" = "x86_64" ] && md5sums[0]='4a4561e456612a6751653b58342d53df'
 
 build() {
-  install -d -m755 ${pkgdir}/usr/lib/mozilla/plugins/ || return 1
-  install -m755 ${srcdir}/libflashplayer.so ${pkgdir}/usr/lib/mozilla/plugins/ || return 1
-  install -d -m755 ${pkgdir}/usr/share/licenses/${pkgname}/ || return 1
-  install -m644 "${_licensefile}" ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.pdf || return 1
+  install -d -m755 ${pkgdir}/usr/lib/mozilla/plugins/
+  install -d -m755 ${pkgdir}/usr/share/licenses/${pkgname}/
+  install -d -m755 ${pkgdir}/etc/adobe
+  install -m755 ${srcdir}/install_flash_player_10_linux/libflashplayer.so ${pkgdir}/usr/lib/mozilla/plugins/
+  install -m644 "${_licensefile}" ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.pdf
+  install -m644 ${srcdir}/mms.cfg ${pkgdir}/etc/adobe/mms.cfg
 }
-md5sums=('e4cb4d26124605a54c3d498cc440368f'
-         '1636037610ee2aa35c5fb736a697b7e0')
+md5sums=('afab0b40b0ae11445e2e90a4a9224a8a'
+         '1636037610ee2aa35c5fb736a697b7e0'
+         'f34aae6279b40e0bd2abfb0d9963d7b8')
diff --git a/abs/extra/community/flashplugin/__changelog b/abs/extra/community/flashplugin/__changelog
new file mode 100644
index 0000000..514d92d
--- /dev/null
+++ b/abs/extra/community/flashplugin/__changelog
@@ -0,0 +1,2 @@
+2/18/11 - chw - Correct path for libflashplugin.so (didn't have install_flash_player_10_linx dir).
+
diff --git a/abs/extra/community/flashplugin/flashplugin.install b/abs/extra/community/flashplugin/flashplugin.install
new file mode 100644
index 0000000..0cc1e2f
--- /dev/null
+++ b/abs/extra/community/flashplugin/flashplugin.install
@@ -0,0 +1,13 @@
+post_install() {
+    echo " >> "
+    echo " >> If you have an NVIDIA card that supports libvdpau or Broadcom Crystal HD chips,"
+    echo " >> uncomment EnableLinuxHWVideoDecode=1 from /etc/adobe/mms.cfg."
+    echo " >> If you run into problems, please contact nVidia or Broadcom along with your system config info / driver version."
+    echo " >> "
+}
+
+post_upgrade() {
+    if  [ "$(vercmp $2 10.2.152.27-2)" -lt 0 ]; then
+        post_install $1
+    fi
+}
diff --git a/abs/extra/community/flashplugin/mms.cfg b/abs/extra/community/flashplugin/mms.cfg
new file mode 100644
index 0000000..716525d
--- /dev/null
+++ b/abs/extra/community/flashplugin/mms.cfg
@@ -0,0 +1,2 @@
+#Hardware video decoding
+#EnableLinuxHWVideoDecode=1
diff --git a/abs/extra/pptpclient/PKGBUILD b/abs/extra/pptpclient/PKGBUILD
new file mode 100644
index 0000000..f94a7d2
--- /dev/null
+++ b/abs/extra/pptpclient/PKGBUILD
@@ -0,0 +1,21 @@
+# Maintainer: Daniel Isenmann <daniel @ archlinux.org>
+# Contributor: Mark Nikkel <mnikkel@gmail.com>
+pkgname=pptpclient 
+pkgver=1.7.2
+pkgrel=2
+pkgdesc="Client for the proprietary Microsoft Point-to-Point Tunneling Protocol, PPTP."
+url="http://pptpclient.sourceforge.net/"
+license=('GPL')
+depends=(glibc ppp iproute2)
+backup=(etc/ppp/{options.pptp})
+source=(http://downloads.sourceforge.net/sourceforge/pptpclient/pptp-$pkgver.tar.gz)
+md5sums=('4c3d19286a37459a632c7128c92a9857')
+arch=('i686' 'x86_64')
+ 
+build() { 
+  cd $srcdir/pptp-$pkgver
+  sed -i '/CFLAGS/d' Makefile
+  sed -i 's|\/bin\/ip|\/usr\/sbin\/ip|g' routing.c 
+  make || return 1
+  make DESTDIR=$pkgdir install
+}
diff --git a/abs/extra/web-on-tv/PKGBUILD b/abs/extra/web-on-tv/PKGBUILD
new file mode 100644
index 0000000..7fd7a73
--- /dev/null
+++ b/abs/extra/web-on-tv/PKGBUILD
@@ -0,0 +1,16 @@
+# $Id: PKGBUILD 5936 2008-07-21 20:24:16Z thomas $
+# Maintainer: Cecil Watson<knoppmyth@gmail.com>
+
+pkgname=web-on-tv
+pkgver=0.01.0
+pkgrel=4
+pkgdesc="Added multiple websites with 10' UIs to Online Streams."
+arch=('i686' 'x86_64')
+license=('GPL2')
+url="http://www.linhes.org/"
+depends=('chromium' 'flashplugin')
+install=web-on-tv.install
+
+#build() {
+#}
+md5sums=()
diff --git a/abs/extra/web-on-tv/web-on-tv.install b/abs/extra/web-on-tv/web-on-tv.install
new file mode 100644
index 0000000..9764cff
--- /dev/null
+++ b/abs/extra/web-on-tv/web-on-tv.install
@@ -0,0 +1,41 @@
+# arg 1:  the new package version
+post_install() {
+  grep -v -e /mythmenu /tmp/is.xml > /tmp/is.xml.tmp
+  echo "<!--#WebOnTV-->" >> /tmp/is.xml.tmp
+  echo "   <button>" >> /tmp/is.xml.tmp
+  echo "     <type>STREAM</type>" >> /tmp/is.xml.tmp
+  echo "     <text>Google Spotlight</text>" >> /tmp/is.xml.tmp
+  echo "     <action>EXEC /usr/bin/chromium --kiosk http://www.google.com/tv/spotlight-gallery.html</action>" >> /tmp/is.xml.tmp 
+  echo "   </button>" >> /tmp/is.xml.tmp
+  echo "<!--#WebOnTV-->" >> /tmp/is.xml.tmp
+  echo "" >> /tmp/is.xml.tmp
+  echo "</mythmenu>" >> /tmp/is.xml.tmp
+  mv /tmp/is.xml.tmp /usr/share/mythtv/themes/defaultmenu/is.xml
+}
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_upgrade() {
+  mv /usr/share/mythtv/themes/defaultmenu/is.xml /tmp/is.xml.tmp
+  sed -e '/\#WebOn/,/\#WebOn/d' < /tmp/is.xml.tmp > /usr/share/mythtv/themes/defaultmenu/is.xml
+  grep -v -e /mythmenu /tmp/is.xml > /tmp/is.xml.tmp
+  echo "<!--#WebOnTV-->" >> /tmp/is.xml.tmp
+  echo "   <button>" >> /tmp/is.xml.tmp
+  echo "     <type>STREAM</type>" >> /tmp/is.xml.tmp
+  echo "     <text>Google Spotlight</text>" >> /tmp/is.xml.tmp
+  echo "     <action>EXEC /usr/bin/chromium --kiosk http://www.google.com/tv/spotlight-gallery.html</action>" >> /tmp/is.xml.tmp 
+  echo "   </button>" >> /tmp/is.xml.tmp
+  echo "<!--#WebOnTV-->" >> /tmp/is.xml.tmp
+  echo "" >> /tmp/is.xml.tmp
+  echo "</mythmenu>" >> /tmp/is.xml.tmp
+  mv /tmp/is.xml.tmp /usr/share/mythtv/themes/defaultmenu/is.xml	
+  }
+
+# arg 1:  the old package version
+post_remove() {
+	mv /usr/share/mythtv/themes/defaultmenu/is.xml /tmp/is.xml.tmp
+	sed -e '/\#WebOn/,/\#WebOn/d' < /tmp/is.xml.tmp > /usr/share/mythtv/themes/defaultmenu/is.xml
+	}
+
+op=$1
+shift
+$op $*