Sun Jan 29 23:15:02 UTC 2012

22 files changed, 1576 insertions, 3 deletions

diff --git a/staging/capi4hylafax/PKGBUILD b/staging/capi4hylafax/PKGBUILD
new file mode 100644
index 000000000..5f5adc139
--- /dev/null
+++ b/staging/capi4hylafax/PKGBUILD
@@ -0,0 +1,55 @@
+# $Id: PKGBUILD 147956 2012-01-29 03:57:58Z eric $
+#Maintainer: Tobias Powalowski <tpowa@archlinux.org>
+
+pkgname=capi4hylafax
+pkgver=010300
+pkgrel=5
+pkgdesc="capi plugin for hylafax to enable isdn faxing"
+arch=(i686 x86_64)
+url="ftp://ftp.avm.de/tools"
+license=('GPL')
+depends=('glibc' 'capi4k-utils' 'hylafax' 'gcc-libs' 'libtiff' 'dialog')
+source=(ftp://ftp.avm.de/tools/capi4hylafax.linux/capi4hylafax-01.03.00.tar.gz
+	config.faxCAPI capi4hylafax.rc)
+md5sums=('d37dc652ac80d1525ef8693be55ee67f'
+         '653b60695d21c128f020a86274ca9192'
+         '1fe40c58289fa3ba625ce6fe2fdb3d07')
+install=capi4hylafax.install
+backup=(var/spool/hylafax/etc/config.faxCAPI)
+
+build() {
+  cd "$srcdir"/$pkgname-01.03.00
+# fix config file
+  sed -i -e 's#/etc/config.faxCAPI#/var/spool/hylafax/etc/config.faxCAPI#g' src/defaults.h.in
+  autoreconf --force --install
+  ./configure
+  make
+}
+
+package() {
+  cd "$srcdir"/$pkgname-01.03.00
+  install -m755 -D src/faxsend/c2faxsend "$pkgdir"/usr/bin/c2faxsend
+  install -m755 -D src/faxrecv/c2faxrecv "$pkgdir"/usr/bin/c2faxrecv
+  install -m755 -D setupconffile "$pkgdir"/usr/bin/c2faxaddmodem
+  install -m644 -D "$srcdir"/config.faxCAPI "$pkgdir"/var/spool/hylafax/etc/config.faxCAPI
+  install -m755 -D "$srcdir"/capi4hylafax.rc "$pkgdir"/etc/rc.d/capi4hylafax
+# adding FIFO
+  mkfifo "$pkgdir"/var/spool/hylafax/FIFO.faxCAPI
+  chown 10 "$pkgdir"/var/spool/hylafax/FIFO.faxCAPI
+  chgrp 14 "$pkgdir"/var/spool/hylafax/FIFO.faxCAPI
+  chmod 0600 "$pkgdir"/var/spool/hylafax/FIFO.faxCAPI
+# fix /var/spool/hylafax permission
+  chown 10 "$pkgdir"/var/spool/hylafax
+  chgrp 14 "$pkgdir"/var/spool/hylafax
+# adding udev rule
+  mkdir -p "$pkgdir"/lib/udev/rules.d
+cat << EOF >> "$pkgdir"/lib/udev/rules.d/53-capi4hylafax.rules
+# CAPI devices
+SUBSYSTEM=="capi", KERNEL=="capi", NAME="capi20", SYMLINK+="isdn/capi20", GROUP="uucp"
+SUBSYSTEM=="tty" KERNEL=="capi[0-9]*", NAME="capi/%n", GROUP="uucp"
+
+EOF
+# fix c2faxadd
+  sed -i -e 's#/etc/config.faxCAPI#/var/spool/hylafax/etc/config.faxCAPI#g' "$pkgdir"/usr/bin/c2faxaddmodem
+  echo "main_config_dialog" >>  "$pkgdir"/usr/bin/c2faxaddmodem
+}
diff --git a/staging/capi4hylafax/capi4hylafax.install b/staging/capi4hylafax/capi4hylafax.install
new file mode 100644
index 000000000..20c2d8f63
--- /dev/null
+++ b/staging/capi4hylafax/capi4hylafax.install
@@ -0,0 +1,16 @@
+post_install() {
+cat << EOF
+For more information about setting up the package, please have a look here:
+"http://wiki.archlinux.org/index.php/capi4hylafax"
+EOF
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+cat << EOF
+Please remove your additions to /var/spool/hylafax/etc/config
+EOF
+}
diff --git a/staging/capi4hylafax/capi4hylafax.rc b/staging/capi4hylafax/capi4hylafax.rc
new file mode 100755
index 000000000..51025b020
--- /dev/null
+++ b/staging/capi4hylafax/capi4hylafax.rc
@@ -0,0 +1,49 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+PID=`pidof -o %PPID /usr/bin/c2faxrecv`
+case "$1" in
+  start)
+    stat_busy "Starting capi4hylafax"
+    if [ -z "$PID" ]; then
+    /usr/bin/c2faxrecv > /dev/null &
+       faxmodem faxCAPI
+    fi
+    if [ ! -f /var/run/faxq.pid ]; then
+       stat_fail
+       echo "ERROR: hylafax is not running"
+       exit 1
+    fi
+    if [ ! -f /var/run/hfaxd.pid ]; then
+    stat_fail
+    echo "ERROR: hylafax is not running"
+    exit 1
+    fi
+    if [ ! -z "$PID" -o $? -gt 0 ]; then
+      stat_fail
+    else
+      add_daemon capi4hylafax
+      stat_done
+    fi
+    ;;
+  stop)
+    stat_busy "Stopping capi4hylafax"
+    [ ! -z "$PID" ]  && kill $PID &> /dev/null
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      rm_daemon capi4hylafax
+      stat_done
+    fi
+    ;;
+  restart)
+    $0 stop
+    sleep 2
+    $0 start
+    ;;
+  *)
+    echo "usage: $0 {start|stop|restart}"  
+esac
+exit 0
diff --git a/staging/capi4hylafax/config.faxCAPI b/staging/capi4hylafax/config.faxCAPI
new file mode 100644
index 000000000..b2137757a
--- /dev/null
+++ b/staging/capi4hylafax/config.faxCAPI
@@ -0,0 +1,397 @@
+#
+# EDIT THIS CONFIGURATION TO REFLECT YOUR SETUP
+#
+
+# Grundsätzliches:
+# - Es gibt für jeden Wert einen Standardzustand (default), sodass jede Zeile
+#   der Datei oder auch das komplette Configfile ausgelassen werden kann.
+# - Es gibt ausschließlich ein Configfile, in dem alle nötigen Angaben für
+#   "c2faxsend/-receive" eingetragen werden können.
+# - Werden für HylaFAX mehrere virtuelle Geräte (devices) angelegt, muss es
+#   für jedes Device ein Configfile im Format config.[DeviceName] geben.
+#   Dessen Existenz wird von HylaFAX überprüft. Ohne dieses File kann die
+#   Arbeit mit dem Device nicht aufgenommen werden. Die Existenz einer
+#   solchen Datei kann am einfachsten durch einen Link auf dieses ConfigFile
+#   oder ein minimales "dummy"-ConfigFile nachgewiesen werden.
+#
+# Basics:
+# - There is a default condition for each value, such that each line of the
+#   file or the complete configfile can be left out.
+# - There is only one configfile in which all information required for
+#   "c2faxsend/-receive" can be entered.
+# - If multiple virtual devices are created for HylaFAX, there must be a
+#   Configfile in the format config.[DeviceName] for each device. HylaFAX
+#   checks that this file exists. Without this file, it is not possible to
+#   start working with the device. The easiest way to establish the existence
+#   of such a file is to create a link to this ConfigFile or a minimum
+#   "dummy" ConfigFile.
+
+
+# "SpoolDir" gibt den Pfad an, unter dem im HylaFAX-kompatiblen Betrieb die
+# HylaFAX-Dateien zu finden sind oder unter dem im Stand-Alone-Betrieb die
+# empfangenen Faxe gespeichert werden sollen. Im HylaFAX-kompatiblen Betrieb
+# werden die Faxe im Verzeichnis $(SpoolDir)/recvq gespeichert.
+#
+# "SpoolDir" indicates the path in which the HylaFAX are located in HylaFAX-
+# compatible operation or in which received faxes are to be saved in
+# stand-alone operation. In HylaFAX-compatible operation, faxes are saved in
+# the directory $(SpoolDir)/recvq.
+#
+# default   /var/spool/hylafax
+#
+SpoolDir:               /var/spool/hylafax
+
+
+# "FaxRcvdCmd" gibt das Skript an, das ausgeführt wird, sobald ein Fax
+# empfangen wurde. Im Stand-Alone-Betrieb werden andere Parameter
+# übergeben als für HylaFAX (mehr dazu im sample_faxrcvd).
+#
+# "FaxRcvdCmd" indicates the script performed whenever a fax is
+# received. Parameters other than the ones for HylaFAX are returned in
+# stand-alone operation (see sample_faxrcvd for more information).
+#
+# default   /var/spool/hylafax/bin/faxrcvd
+#
+FaxRcvdCmd:             /var/spool/hylafax/bin/faxrcvd
+
+
+# "PollRcvdCmd" gibt das Skript an, das ausgeführt wird, sobald ein
+# Fax per Faxabruf empfangen wurde. Im Stand-Alone-Betrieb werden
+# andereParameter übergeben als für HylaFAX (mehr dazu im
+# sample_faxrcvd).
+#
+# "PollRcvdCmd" indicates the script performed whenever a fax was
+# received by fax polling. Parameters other than the ones for HylaFAX
+# are returned in stand-alone operation (see sample_faxrcvd for more
+# information).
+#
+# default   /var/spool/hylafax/bin/pollrcvd
+#
+PollRcvdCmd:             /var/spool/hylafax/bin/pollrcvd
+
+
+# "FaxReceiveUser" ist der User, als der c2faxrecv ausgeführt wird.
+# Die Änderung des Users kann nur vom Superuser bzw. "root" erfolgen. Sollte
+# c2faxrecv von einem anderen User gestartet werden, wird dieser Eintrag
+# ignoriert. Hier einen anderen als den Hylafax-Standardwert "uucp"
+# einzutragen ist dann sinnvoll, wenn beispielsweise die Rechte von
+# /dev/capi20 nicht geändert werden sollen oder Ihre Linux-Distribution einen
+# anderen User voraussetzt.
+#
+# "FaxReceiveUser" is the user when c2faxrecv is run. This user can be
+# changed only by the Superuser or "root" user. If c2faxrecv is started by
+# another user, this entry will be ignored. Here it is a good idea to enter a
+# value other than the hylafax default value "uucp", for instance, if the
+# rights of /dev/capi20 are not to be changed or your Linux distribution
+# requires another user.
+#
+# default   ""
+#
+FaxReceiveUser:         uucp
+FaxReceiveGroup:	uucp
+
+
+# Im "LogFile" werden Informationen über den Faxablauf abgespeichert.
+#
+# Information about the order of events in faxing are saved in the "LogFile".
+#
+# default   ""
+#
+LogFile:                /var/spool/hylafax/log/capi4hylafax
+
+
+# Der Befehl "LogTraceLevel" gibt die Menge der Daten an, die in ein LogFile
+# geschrieben werden. Die Spanne reicht von 0 = nichts bis 4 = vieles.
+#
+# The "LogTraceLevel" command indicates the amount of data written in a
+# LogFile. The range goes from 0 = nothing to 4 = many.
+#
+# default   0
+#
+LogTraceLevel:          0
+
+
+# "LogFileMode" sind die Angaben (mode), aufgrund derer sowohl das gerade
+# erwähnte LogFile als auch die LogFiles für HylaFAX angelegt werden.
+#
+# "LogFileMode" is the mode, on the basis of which both the LogFile just
+# mentioned and the LogFiles for HylaFAX are generated.
+#
+# default   0600
+#
+LogFileMode:            0600
+
+
+# Die geschweiften Klammern geben Anfang und Ende einer Section an.
+# Jede Section darf eine oder mehrere SubSections enthalten.
+# SubSubSections sind nicht erlaubt.
+# Dabei enthält die Section Angaben zu einem virtuellen Device;
+# die Subsection die Angaben für die Rufannahme jedes Controllers.
+# Es können beliebig viele Sections und, darin enthalten, jeweils beliebig
+# viele Subsections erzeugt werden.
+# Jede Section muss aber einen anderen HylafaxDeviceName erhalten;
+# zusätzlich muss in jeder Subsection innerhalb einer Section ein anderer
+# Controller aufgeführt werden. Beim Stand-Alone-Betrieb ist eine Section mit
+# entsprechend vielen Subsections ausreichend, da in diesem Betriebsmodus die
+# virtuellen DeviceNamen keine Rolle spielen.
+#
+# The curved brackets indicate the beginning and end of a section.
+# Each section may contain one or more subsections.
+# SubSubSections are not permitted.
+# The section contains information about a virtual device; the subsection the
+# call acceptance information for each controller.
+# Any number of sections containing any number of subsections may be
+# generated, but each section must receive a different HylafaxDeviceName; and
+# a different controller must be listed in every subsection within a section.
+# For stand-alone operation, it is sufficient to have just one section with
+# as many subsections as required, since virtual DeviceNames do not play
+# any role in this mode of operation.
+#
+{
+
+    # "HylafaxDeviceName" ist der Name, unter dem sich C4H bei HylaFAX als
+    # "virtuelles Modem" anmeldet. Sollen für HylaFAX mehrere dieser "Modems"
+    # erzeugt werden, legen Sie einfach eine neue Section mit einem anderen
+    # HylafaxDeviceName an.
+    #
+    # "HylafaxDeviceName" is the name, under which C4H registers in HylaFAX as
+    # a "virtual modem". If multiple "modems" are to be generated for HylaFAX,
+    # simply create a new section with another HylafaxDeviceName.
+    #
+    # default   faxCAPI
+    #
+    HylafaxDeviceName:          faxCAPI
+
+
+    # "RecvFileMode" ist der Mode, in dem empfangene Faxe abgespeichert
+    # werden. User und Group der Datei wird durch FaxReceiveUser (s.o.)
+    # festgelegt.
+    #
+    # "RecvFileMode" is the mode, in which received faxes are saved. User and
+    # Group of the file are determined by the FaxReceiveUser (see above).
+    #
+    # default   0600
+    #
+    RecvFileMode:               0600
+
+
+    # "FAXNumber" ist die eigene Nummer des Computers und wird der Gegenseite
+    # mitgeteilt (sichtbar z. B. im Fax-Journal).
+    #
+    # "FAXNumber" is the fax number of the computer itself and is transmitted
+    # to the remote site (visible in the Fax Journal).
+    #
+    # default   ""
+    #
+    FAXNumber:                  +49.00.00000
+
+
+    # "LocalIdentifier" ist der von CAPI aus konfigurierbare Teil der
+    # Kopfzeile. Ein leerer Eintrag führt dazu, dass keine Fax-Kopfzeile
+    # eingefügt wird.
+    #
+    # "LocalIdentifier" is the part of the fax header which can be configured
+    # from CAPI. An empty entry specifies an empty header.
+    #
+    # default   ""
+    #
+    LocalIdentifier:            "AVM CAPI4HylaFAX"
+
+
+    # Die maximale Anzahl von gleichzeitig empfangbaren Faxen kann
+    # durch "MaxConcurrentRecvs" angepaßt werden. Diese Anzahl wird
+    # durch die Anzahl der durch die Hardware zur Verfügung
+    # gestellten B-Kanäle begrenzt.
+    #
+    # The maximum number of faxes that can be received at the same
+    # time can be adjusted using "MaxConcurrentRecvs". This number
+    # is limited by the number of B channels provided by the hardware.
+    #
+    # default   2
+    #
+    MaxConcurrentRecvs:         2
+
+
+    # ----------- outgoing params -----------
+
+    # "OutgoingController" gibt den Controller an, über den eine externe
+    # Verbindung aufgebaut werden soll.
+    #
+    # "OutgoingController" indicates the controller which is to be used to
+    # establish an external connection.
+    #
+    # default   1
+    #
+    OutgoingController:         1
+
+
+    # Die "OutgoingMSN" ist die MSN, die für ausgehenden Faxe benutzt wird.
+    #
+    # The "OutgoingMSN" is the MSN used for outgoing faxes.
+    #
+    # default   ""
+    #
+    OutgoingMSN:
+
+
+    # CLIR (Rufnummernunterdrückung) kann über "SuppressMSN" und den Wert (0)
+    # abgeschaltet oder mit dem Wert (1) erneut angeschaltet werden.
+    #
+    # CLIR (Calling Line Identification Restriction) can be switched off using
+    # the value (0) or switched back on by entering the value (1).
+    #
+    # default   0
+    #
+    SuppressMSN:                0
+
+
+    # "NumberPrefix" wird vor jede Telefonnummer gestellt. Dies ist bei
+    # Nebenstellenanlagen wichtig, bei denen für den Aufbau einer externen
+    # Verbindung eine Ziffer vorgewählt werden muss.
+    #
+    # "NumberPrefix" is set to precede each telephone number. This is
+    # important for PBX systems which require that a number be dialed to
+    # obtain an outside line.
+    #
+    # default   ""
+    #
+    NumberPrefix:
+
+
+    # Wenn der Wert in "UseISDNFaxService" = 1 ist, wird ein ausgehender Ruf
+    # mit der ISDN-FAX-G3 Dienstekennung aufgebaut. Bei 0 wird eine 3.1kHz
+    # Audio-Verbindung hergestellt.
+    #
+    # When in "UseISDNFaxService" the value is = 1, an outoing call will be
+    # established using the ISDN-FAX-G3 service indicator. For 0, a 3.1kHz
+    # audio connection is established.
+    #
+    # default   0
+    #
+    UseISDNFaxService:          0
+
+
+    # Gibt die Dauer in Sekunden an, die auf eine Verbindungsannahme durch die
+    # Gegenseite gewartet wird. So wird beim Faxversand nicht automatisch die
+    # gesamte von der Telekom vorgegebene Wartezeit genutzt. Eine Angabe des
+    # Wertes 0 nutzt die gesamte Wartezeit.
+    #
+    # The duration in seconds you wait for the remote site to accept your
+    # outgoing call In this way you do not have to use the entire ringing
+    # duration preset by the telephone company. The default value 0 uses the
+    # entire ringing duration.
+    #
+    # default   0
+    #
+    RingingDuration:            0
+
+
+    # ----------- incoming params -----------
+    {
+
+        # Controller, für den diese Subsection gilt.
+        #
+        # Controller for which this subsection is valid.
+        #
+        # default   1
+        #
+        Controller:             1
+
+
+        # Wenn "AcceptSpeech" auf 1 steht, wird auch die Dienstekennung
+        # "Sprache" angenommen.
+        #
+        # If "AcceptSpeech" is set to 1, the service indicator "Voice" also
+        # will be accepted.
+        #
+        # default   0
+        #
+        AcceptSpeech:           1
+
+
+        # Sofern man DDI nutzen will, sollte man "UseDDI" auf 1 stellen.
+        #
+        # If DDI is to be used, "UseDDI" should be set to a value of 1.
+        #
+        # default   0
+        #
+        UseDDI:                 0
+
+
+        # Die DDI-Stammnummer wird bei "DDIOffset" eingetragen.
+        # Der Standardwert führt zu keinem korrekten Ergebnis und
+        # sollte, sofern "UseDDI" auf 1 gestellt wurde, immer
+        # verändert werden.
+        #
+        # "DDIOffset" indicates the DDI offset number which precedes
+        # extension number. Because the default value can't guarantee
+        # a correct result, this value should be modified whenever
+        # "UseDDI" is set to 1.
+        #
+        # default   ""
+        #
+        DDIOffset:              "12345"
+
+
+        # "DDILength" gibt die Anzahl der Durchwahlziffern an. (Diese Ziffern
+        # werden lediglich als Teil der Empfängernummer mitgeteilt.) Der
+        # Standardwert sollte bei Verwendung von DDI ebenfalls angepasst
+        # werden.
+        #
+        # "DDILength" indicates the number of digits in the extension. (These
+        # numbers are only used as a component of the recipient's number.) The
+        # default value should be adapted whenever DDI is used.
+        #
+        # default   0
+        #
+        DDILength:              3
+
+
+        # Bei "IncomingDDIs" können in einer durch Komma getrennten Liste alle
+        # Durchwahlziffern (DDIs) angegeben werden, für die Rufe angenommen
+        # werden sollen. Eine Bereichsangabe ist auch möglich (z.B. 100-300),
+        # wobei aber keine offenen Bereiche (z.B. -100) erlaubt sind.
+        # Sofern IncommingDDIs gesetzt ist, wird DDILength ignoriert.
+        #
+        # In "IncomingDDIs", all extension numbers (DDIs) for which calls are
+        # to be accepted may be listed, separated by commas. It is also
+        # possible to specify a range (e.g. 100-300); here no open ranges are
+        # permitted (e.g. -100). When the "IncomingDDIs" switch is set, the
+        # parameters for DDILength will be ignored.
+        #
+        # default   ""
+        #
+        IncomingDDIs:
+
+
+        # Bei "IncomingMSNs" können in einer durch Komma getrennten Liste alle
+        # MSNs angegeben werden, für die Rufe angenommen werden sollen. Ist
+        # die Liste leer, werden alle Rufe auf ISDN FAX G3, 3,1kHz Audio und
+        # eventuell "Sprache" angenommen.
+        # Wenn "UseDDI" auf 1 gestellt ist, wird "IncomingMSNs" ignoriert.
+        #
+        # In "IncomingMSNs", all MSNs for which calls are to be accepted may
+        # be listed, separated by commas. When the list is empty, all calls
+        # are accepted for ISDN FAX G3, 3,1kHz audio and perhaps "Voice".
+        # When "UseDDI" is set to 1, "IncomingMSNs" is ignored.
+        #
+        # default   ""
+        #
+        IncomingMSNs:
+
+
+        # Wenn "AcceptGlobalCall" auf 1 steht, werden auch Calls ohne
+        # Zielrufnummer (ohne MSN) angenommen.
+        # Notwendig hinter einigen Telefonanlagen, die keine Zielrufnummer
+        # senden.
+        #
+        # If "AcceptGlobalCall" is set to 1, calls without Called Party
+        # Number also will be accepted.
+        # Needed on internal ports of some PBX.
+        #
+        # default   1
+        #
+        AcceptGlobalCall:   1
+    }
+}
+
diff --git a/staging/digikam/PKGBUILD b/staging/digikam/PKGBUILD
index 96ef60e83..2e3484667 100644
--- a/staging/digikam/PKGBUILD
+++ b/staging/digikam/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 147663 2012-01-26 04:48:55Z eric $
+# $Id: PKGBUILD 147940 2012-01-28 11:36:42Z andrea $
 # Maintainer: Ronald van Haren <ronald@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
@@ -6,7 +6,7 @@
 pkgbase=digikam
 pkgname=('digikam' 'kipi-plugins' 'libkface' 'libkgeomap' 'libkvkontakte' 'libmediawiki')
 pkgver=2.5.0
-pkgrel=2
+pkgrel=4
 pkgdesc="Digital photo management application for KDE"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -55,7 +55,6 @@ package_digikam() {
 
   # these are in oxygen-icons
   rm -rf ${pkgdir}/usr/share/icons
-
 }
 
 package_libkface() {
diff --git a/staging/hylafax/PKGBUILD b/staging/hylafax/PKGBUILD
new file mode 100644
index 000000000..f00c0d884
--- /dev/null
+++ b/staging/hylafax/PKGBUILD
@@ -0,0 +1,53 @@
+# $Id: PKGBUILD 147950 2012-01-29 02:47:19Z eric $
+# Maintainer: Paul Mattal <paul@archlinux.org>
+pkgname=hylafax
+pkgver=6.0.5
+pkgrel=3
+pkgdesc="Fax Server"
+arch=('i686' 'x86_64')
+install='hylafax.install'
+license=('custom')
+depends=('libtiff' 'pam' 'ghostscript')
+makedepends=('smtp-server')
+url="http://www.hylafax.org/"
+backup=(var/spool/hylafax/bin/{faxrcvd,notify}
+	usr/lib/fax/{faxcover.ps,hfaxd.conf,pagesizes,typerules}
+	var/spool/hylafax/etc/hosts.hfaxd) 
+source=(ftp://ftp.hylafax.org/source/${pkgname}-${pkgver}.tar.gz 
+        hylafax 
+        hylafax.cron.daily 
+        config.local
+        configure-6.0.5.patch 
+        hylafax-libtiff4.patch)
+md5sums=('eb9ac942354ad708e20e4583cec6615f'
+         '6602288a405324d8c8e3c5eac2bf19fd'
+         '52beffe7dc296b4f9ce9fd0387f7804e'
+         '0d2ce24d918226a852539aebf57d3f4a'
+         '51d9f639bb76e5e39cdc8e2ac07e208d'
+         '3d239c186f24720e945508d349b069b1')
+
+build() {
+  cd "$srcdir/${pkgname}-${pkgver}"
+  cp ../config.local .
+  # fix compiling
+  patch -Np0 -i ../configure-6.0.5.patch
+  patch -Np1 -i ../hylafax-libtiff4.patch
+  ./configure --nointeractive --with-OPTIMIZER="${CFLAGS}"
+  make
+}
+
+package () {
+  cd "$srcdir/${pkgname}-${pkgver}"
+  mkdir -p "$pkgdir"/usr/{bin,lib/fax,sbin,share/ghostscript/fonts}
+  mkdir -p "$pkgdir"/var/{spool/hylafax,lock}
+  make ROOT="$pkgdir" install
+  install -D -m 755 "$srcdir"/hylafax "$pkgdir"/etc/rc.d/hylafax
+  install -D -m 744 "$srcdir"/hylafax.cron.daily "$pkgdir"/etc/cron.daily/hylafax
+  # add missing awk file for notify-4.1 script
+  install -D -m 755 "$srcdir"/${pkgname}-${pkgver}/util/notify.awk \
+  	"$pkgdir"/var/spool/hylafax/bin/notify.awk
+  # fix permission on /var/lock
+  chmod 1777 "$pkgdir"/var/lock
+
+  install -D -m644 COPYRIGHT "$pkgdir"/usr/share/licenses/$pkgname/COPYRIGHT
+}
diff --git a/staging/hylafax/config.local b/staging/hylafax/config.local
new file mode 100644
index 000000000..0d8e2bcd8
--- /dev/null
+++ b/staging/hylafax/config.local
@@ -0,0 +1,273 @@
+# $Id: config.local,v 1.1 2003/06/28 00:24:49 jproctor Exp $
+#
+# HylaFAX Facsimile Software
+#
+# Copyright (c) 1990-1996 Sam Leffler
+# Copyright (c) 1991-1996 Silicon Graphics, Inc.
+# HylaFAX is a trademark of Silicon Graphics, Inc.
+# 
+# Permission to use, copy, modify, distribute, and sell this software and 
+# its documentation for any purpose is hereby granted without fee, provided
+# that (i) the above copyright notices and this permission notice appear in
+# all copies of the software and related documentation, and (ii) the names of
+# Sam Leffler and Silicon Graphics may not be used in any advertising or
+# publicity relating to the software without the specific, prior written
+# permission of Sam Leffler and Silicon Graphics.
+# 
+# THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND, 
+# EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY 
+# WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.  
+# 
+# IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
+# ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
+# OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+# WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF 
+# LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE 
+# OF THIS SOFTWARE.
+#
+
+#
+# This file holds site-specific configuration parameters.
+#
+# Nothing is defined in here by default, the definitions
+# commented out below serve as documentation for what you
+# can set in this file or a config.local file.
+#
+# Note that you do not need to set anything here unless you
+# want to override the auto-configuration behaviour and/or
+# interactive prompting done by the configure script.
+#
+
+#
+# Package controls.
+#
+#DSO="auto"			# configure DSO support (auto|IRIX|no)
+#GETTY="auto"			# type of getty support (auto|BSD|SysV)
+#HTML="no"			# install HTML documentation (yes|no)
+#PS="auto"			# PostScript support to use (auto|gs|dps|imp)
+#SGI2FAX="auto"			# configure SGI image support (auto|yes|no)
+#DPS="no"			# install SGI DPS-based RIP (yes|no)
+#GS="no"			# install Ghostscript RIP (yes|no)
+#IMP="no"			# install SGI Impressario 2.1 support (yes|no)
+#REGEX="yes"			# use distributed regular expression package
+#UTMP="utmpx"			# type of utmp+wtmp handling (auto|utmp|utmpx)
+#DBLIB="no"			# use distributed libdb distribution
+
+#
+# Directory parameters.
+#
+DIR_BIN="/usr/bin"		# directory for client apps
+DIR_LIB="/usr/lib"
+DIR_LIBDATA="/usr/lib/fax"		# directory for client data
+DIR_LIBEXEC="/usr/lib/fax"		# directory for libraries&hidden apps
+DIR_MAN="/usr/share/man"		# directory for manual pages
+DIR_SPOOL="/var/spool/hylafax"		# directory for spooling area
+DIR_SBIN="/usr/sbin"		# directory for system apps
+DIR_LOCKS="/var/lock"		# directory for UUCP lock files
+FONTMAP="/usr/share/ghostscript/fonts"	# directorys containing Fontmap files
+DIR_LOCALE="/usr/share/locale"
+#PATH_AFM="/usr/lib/DPS/AFM"		# directorys for AFM files
+
+#
+# HTML-specific parameters; only used when the
+# HTML package is configured for installation.
+#
+# Note that ``PATH''s are the virtual pathnames used
+# in forming URLs; they are not directory pathnames
+# in the filesystem.
+#
+DIR_HTML="/usr/share/hylafax/httpd"	# directory for HTML documentation
+#DIR_CGI="/var/httpd/cgi-bin"		# directory for CGI scripts
+#HTMLPATH="/hylafax"			# virtual path to HTML materials
+#CGIPATH="/cgi-bin"			# virtual path to CGI scripts
+
+#
+# Miscellaneous parameters.
+#
+#DEFVRES="196"				# default vertical res for outbound fax
+#FILLORDER="MS2LSB"			# bit order of cpu (MSB2LSB/LSB2MSB)
+#AXGID="uucp"				# group ID for fax user
+#FAXUID="uucp"				# user ID for fax user
+#PAGESIZE="North American Letter"	# default page size
+SYSGID="root"				# group ID for system installs
+SYSUID="root"				# user ID for system installs
+#LOCKS="ascii"				# default UUCP lockfile scheme
+#
+#PATH_GETTY="/etc/getty"		# pathname of suitable getty program
+#PATH_VGETTY="/bin/vgetty"		# pathname of voice getty program
+#PATH_EGETTY="/bin/egetty"		# pathname of external getty program
+#PATH_SENDMAIL="/usr/lib/sendmail"	# pathname of suitable sendmail program
+#PATH_GSRIP="/usr/local/bin/gs"		# pathname of Ghostscript-based RIP
+#PATH_DPSRIP="/var/spool/hylafax/bin/ps2fax.exe" # pathname of DPS-based RIP
+#PATH_IMPRIP="/usr/lib/print/psrip"	# pathname of Impressario 2.1 RIP
+#MANSCHEME="sysv-source-cat-strip"	# manual page installation scheme
+#SYSVINIT="auto"		# install SysV-style init support (auto|yes|no)
+#DIR_SYSVINIT="/etc/init.d"	# location of SysV-style init script
+#DIR_SYSVINITSTART="../rc2.d"	# location of SysV-style start script
+#DIR_SYSVINITSTOP="../rc0.d"	# location of SysV-style stop script
+#NAME_SYSVINITSTART="S80fax"	# name of SysV-style start script
+#NAME_SYSVINITSTOP="K80fax"	# name of SysV-style stop script
+#FAXQ_SERVER=yes		# init script starts faxq
+#HFAXD_SERVER=yes		# init script starts hfaxd
+#HFAXD_OLD_PROTOCOL=no		# don't start old protocol
+#HFAXD_SNPP_SERVER=no		# don't start paging protocol
+
+# SVR4 packaging stuff
+#PKG_ARCH=				# ARCH variable in pkginfo file
+#PKG_EMAIL=someone@somehost.somedomain	# EMAIL variable in pkginfo file
+#PKG_VENDOR="Your Name Here"		# VENDOR variable in pkginfo file
+#
+
+#
+# Parameters used when building the software.
+#
+# Note that configure has several ENVOPTS built into it that are
+# set according to the target.  This is done to help naive folks.
+#
+# Beware of changing the INSTALL definition; you *must* have an
+# install script that emulates the Silicon Graphics install program!
+#
+#AR="/bin/ar"				# pathname of suitable ar program
+#AROPTS="rc"				# options to ar for creating archive
+#CC="gcc"				# name/pathname of C compiler
+#CXX="gcc"				# name/pathname of C++ compiler
+#CXXFILE="-x c++"			# options for proper C++ processing
+#ENVOPTS="-Aa"				# options for getting ANSI C
+#GCOPTS="-g"				# options to pass C compiler
+#GCXXOPTS="-g"				# options to pass C++ compiler
+#GENDIST="/sbin/gendist"		# pathname of SGI inst generator program
+#INSTALL='${SHELL} ${PORT}/install.sh'	# SGI install program/emulator
+#LIBMALLOC="auto"			# yes|no|auto configure -lmalloc use
+#LIBPORT='${PORT}/libport.a'		# library with emulation code
+#LIBSUN="auto"				# yes|no|auto configure -lsun use
+#LLDOPTS=""				# extra link line options
+#MACHDEPLIBS=""				# extra libraries for linking
+#PORTFUNCS=""				# non-standard functions to emulate
+#PROTOTYPES="-prototypes"		# C compiler options for checking function prototypes
+#RANLIB=":"				# pathname of suitable ranlib program
+#SHDLIBC="-lc_s"			# shared C library, if not standard
+#SIGHANDLERTYPES='(void(*)(int,...))'	# types to check for signal handler
+#STRIP="/bin/strip"			# strip program used by install.sh
+
+#
+# The source for the TIFF library is not required
+# to build this software, but the library is required
+# to link against.  If libtiff is installed in a
+# non-standard location then setup LIBTIFF accordingly.
+#
+#LIBTIFF="-L/usr/local/lib -ltiff"	# linkage convention for libtiff
+#TIFFINC="/usr/local/include"		# place to find tiffio.h
+#TIFFBIN="/usr/local/bin"		# where TIFF tools live
+
+#
+# The source for the ZLIB library is not required
+# to build this software, but the library is required
+# to link against.  If ZLIB is installed in a 
+# non-standard location then setup LIBZ accordingly.
+#
+#LIBZ="-L/usr/local/lib -lz"		# linkage convention for libz
+#ZLIBINC="-I/usr/local/include"		# place to find zlib.h
+
+#
+# The source for the POSIX regular expression package
+# is not required to build this software, but the package
+# is required to link against.  If the copy of the software
+# that is included in this distribution is not to be used
+# then set REGEX=no and supply the following definitions.
+#
+#LIBREGEX=" "				# linkage convention for regex package
+#REGEXINC="/usr/include"		# place to find regex.h
+
+#
+# The LIBDB hashed database package is (currently) used
+# only by the MLA tools that are not publicly available
+# but which are built from within this source tree.  In
+# the future the fax software may use the libdb software
+# for the remote client capabilities database (so these
+# hooks are included now).
+#
+# The source for the LIBDB hashed database package
+# is not required to build this software, but the package
+# is required to link against.  If the copy of the software
+# that is included in this distribution is not to be used
+# then set DBLIB=no and supply the following definitions.
+#
+#LIBDB=" "				# linkage convention for libdb package
+#DBLIBINC="/usr/include"		# place to find db.h
+
+#
+# Parameters to control various workarounds for system bugs.
+#
+# These parameters are normally set in configure based on
+# the target system.  If they are set here, then they will
+# override anything done by configure.
+#
+#CONFIG_OPENFIFO="O_RDONLY"		# mode to open FIFOs in server proc's
+#CONFIG_FIFOBUG="yes"			# enable workaround for FIFO select bug
+#CONFIG_TIOCMBISBYREF="yes"		# pass arg by reference to ioctl
+#CONFIG_WINSZHACK="no"			# include extra files for TIOCWINSZ use
+#CONFIG_ABORTBUG="no"			# enable workaround for abort problems
+#CONFIG_NOREOPEN="yes"			# reopen tty device after toggling DTR
+#CONFIG_NOSTDINDUP="yes"		# do not redirect stdout to stdin in ondelay
+#CONFIG_BADEXECVPROTO="no"		# system has incorrect execv func decl
+#CONFIG_BADEXECVEPROTO="no"		# system has incorrect execve func decl
+#CONFIG_BADGETOPTPROTO="no"		# system has incorrect getopt func decl
+#CONFIG_SOCKARGLENTYPE="unsigned long"	# call-by-ref arg type for socket funcs
+#CONFIG_BADSELECTPROTO="no"		# system has way old select func decl
+#CONFIG_MAXGID="5999"			# maximum permissable GID
+#CONFIG_OSFCNH="auto"			# control inclusion of <osfcn.h>
+
+#
+# Dynamic Shared Object (DSO) support.
+#
+# Beware that adding new support for DSOs may require some
+# modifications to the */Makefile.dso files.
+#
+#DSOSUF="so"				# DSO filename suffix
+#DSODELAY="-delay_load"			# DSO option for delayed loading
+#DSOOPTS="-shared -rdata_shared"	# options for building DSOs
+
+#
+# Makefile construction parameters.
+#
+# These should not normally be set; configure will
+# deduce the appropriate syntax to use for includes.
+#
+#MAKECXXOVERRIDE="=.C"			# make override stuff for SunPRO C++
+#MAKEDEPINCLUDE="include"		# make include for dependency files
+#MAKEDSOINCLUDE="#"			# make include for DSO support
+#MAKEINCLUDE=".include"			# make include syntax
+#MAKELQUOTE="<"				# make include syntax
+#MAKERQUOTE=">"				# make include syntax
+#SETMAKE='MAKE	= ${MAKE}'		# define if make does not setup $MAKE
+#MKDEPCOPTS=""				# C compiler opts to supply w/ -M
+#MKDEPCXXOPTS=""			# C++ compiler opts to supply w/ -M
+
+#
+# General system stuff used by the distribution.
+#
+# Beware of setting these as configure selects several programs
+# based on whether or not they are capable of processing scripts
+# included in the distribution (e.g AWK and SCRIPT_SH, SED).
+#
+#AWK="/bin/awk"				# pathname of suitable awk program
+#CAT="/bin/cat"				# pathname of suitable cat program
+#CHGRP="/etc/chgrp"			# pathname of suitable chgrp program
+#CHMOD="/etc/chmod"			# pathname of suitable chmod program
+#CHOWN="/etc/chown"			# pathname of suitable chown program
+#CMP="/bin/cmp"				# pathname of suitable cmp program
+#COL="/bin/col"				# pathname of suitable col program
+#CP="/bin/cp"				# pathname of suitable cp program
+#ECHO="/bin/echo"			# pathname of suitable echo program
+#GREP="/bin/grep"			# pathname of suitable grep program
+#LN="/bin/ln"				# pathname of suitable ln program
+#LN_S="-s"				# option to ${LN} to create symlink
+#MAN="/usr/bin/man"			# pathname of suitable man program
+#MKDIR="/bin/mkdir"			# pathname of suitable mkdir program
+#MKFIFO="/bin/mkfifo"			# pathname of suitable mkfifo program
+#MV="/bin/mv"				# pathname of suitable mv program
+#MV_F="-f"				# option to ${MV} to force operation
+#RMCMD="/bin/rm"			# pathname of suitable rm program
+#SED="/bin/sed"				# pathname of suitable sed program
+#SCRIPT_SH="/bin/sh"			# pathname of suitable shell
+#SORT="/bin/sort"			# pathname of suitable sort program
diff --git a/staging/hylafax/configure-6.0.5.patch b/staging/hylafax/configure-6.0.5.patch
new file mode 100644
index 000000000..e1f1126a5
--- /dev/null
+++ b/staging/hylafax/configure-6.0.5.patch
@@ -0,0 +1,11 @@
+--- configure.old	2011-08-08 10:19:37.619657223 +0200
++++ configure	2011-08-08 10:20:26.422189170 +0200
+@@ -2882,7 +2882,7 @@
+ 	echo '#define HAS_FCHMOD 1'
+ 	Note "... configure use of fchmod"
+ 	CheckFuncDecl fchmod 'extern int fchmod(int, mode_t);' \
+-	    unistd.h libc.h $OSFCNH sys/stat.h
++	    unistd.h $OSFCNH sys/stat.h libc.h
+     }
+     CheckFuncDecl mknod 'extern int mknod(const char*, mode_t, dev_t);' \
+ 	unistd.h sys/stat.h
diff --git a/staging/hylafax/hylafax b/staging/hylafax/hylafax
new file mode 100755
index 000000000..9f949c2ac
--- /dev/null
+++ b/staging/hylafax/hylafax
@@ -0,0 +1,71 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+DAEMON_NAME="hylafax"
+FAXQ_BIN=/usr/sbin/faxq
+FAXQ_PID=`pidof -o %PPID $FAXQ_BIN`
+HFAXD_BIN=/usr/lib/fax/hfaxd
+HFAXD_PID=`pidof -o %PPID $HFAXD_BIN`
+HFAXD_OPTS="-i hylafax"
+FAXQUIT_BIN=/usr/sbin/faxquit
+
+. /var/spool/hylafax/etc/setup.cache
+
+case "$1" in
+  start)
+    stat_busy "Starting $DAEMON_NAME"
+    [ -z "$FAXQ_PID" ] && $FAXQ_BIN
+    if [ $? -gt 0 ]; then
+      stat_fail
+      exit 1
+    else
+      echo `pidof -o %PPID $FAXQ_BIN` > /var/run/faxq.pid
+    fi
+    [ -z "$HFAXD_PID" ] && $HFAXD_BIN $HFAXD_OPTS
+    if [ $? -gt 0 ]; then
+      stat_fail
+      exit 1
+    else
+      echo `pidof -o %PPID $HFAXD_BIN` > /var/run/hfaxd.pid
+    fi
+    add_daemon $DAEMON_NAME
+    stat_done
+    ;;
+
+  stop)
+    stat_busy "Stopping $DAEMON_NAME"
+	 $FAXQUIT_BIN >/dev/null 2>&1
+    if [ $? -gt 0 ]; then
+      [ ! -z "$FAXQ_PID" ]  && kill $FAXQ_PID &> /dev/null
+      if [ $? -gt 0 ]; then
+        stat_fail
+        exit 1
+      else
+        rm /var/run/faxq.pid &> /dev/null
+      fi
+    else
+      rm /var/run/faxq.pid &> /dev/null
+    fi
+    [ ! -z "$HFAXD_PID" ]  && kill $HFAXD_PID &> /dev/null
+    if [ $? -gt 0 ]; then
+      stat_fail
+      exit 1
+    else
+      rm /var/run/hfaxd.pid &> /dev/null
+    fi
+    rm_daemon $DAEMON_NAME
+    stat_done
+    ;;
+
+  restart)
+    $0 stop
+    sleep 1
+    $0 start
+    ;;
+
+  *)
+    echo "usage: $0 {start|stop|restart}"  
+esac
+exit 0
diff --git a/staging/hylafax/hylafax-libtiff4.patch b/staging/hylafax/hylafax-libtiff4.patch
new file mode 100644
index 000000000..4a49511f8
--- /dev/null
+++ b/staging/hylafax/hylafax-libtiff4.patch
@@ -0,0 +1,229 @@
+--- hylafax-6.0.5/configure	2010-09-15 10:42:36.000000000 -0400
++++ hylafax-5.5.1/configure	2012-01-02 17:44:20.000000000 -0500
+@@ -2531,6 +2566,7 @@
+     Note "... checking TIFF library version"
+     tiff_runlen_t=""
+     cat>t.c<<EOF
++#include <stdlib.h>
+ #include <stdio.h>
+ #include "tiffio.h"
+ main()
+@@ -2550,8 +2586,18 @@
+ 	Note "  Found libtiff version ${lib_ver}"
+ 	if [ ${header_ver} -ge 19960307 ]; then
+ 	    case ${lib_ver} in
+-		3.4)		tiff_runlen_t="uint16" ;;
+-		3.[56789])	tiff_runlen_t="uint32" ;;
++		3.4)		tiff_runlen_t="uint16"
++				echo '#define TIFFSTRIPBYTECOUNTS uint32'
++				echo '#define TIFFVERSION TIFF_VERSION'
++				echo '#define TIFFHEADER TIFFHeader';;
++		3.[56789])	tiff_runlen_t="uint32"
++				echo '#define TIFFSTRIPBYTECOUNTS uint32'
++				echo '#define TIFFVERSION TIFF_VERSION'
++				echo '#define TIFFHEADER TIFFHeader';;
++		4.0)		tiff_runlen_t="uint32"
++				echo '#define TIFFSTRIPBYTECOUNTS uint64'
++				echo '#define TIFFVERSION TIFF_VERSION_CLASSIC'
++				echo '#define TIFFHEADER TIFFHeaderClassic';;
+ 	    esac
+ 	fi
+     else
+@@ -2588,7 +2634,7 @@
+ Incompatible TIFF Library.
+ 
+ HylaFAX ${VERSION} requires TIFF software distribution versions 3.4 through
+-3.9.  If you do not have up to date TIFF software on your system
++4.0.  If you do not have up to date TIFF software on your system
+ then you can retrieve it from the location where you obtained this software.
+ The Home Page for version 3.5 and later is http://www.remotesensing.org/libtiff/
+ EOF
+--- hylafax-6.0.5/hfaxd/FileTransfer.c++	2010-09-15 10:42:36.000000000 -0400
++++ hylafax-5.5.1/hfaxd/FileTransfer.c++	2012-01-02 17:44:19.000000000 -0500
+@@ -164,26 +142,26 @@
+  * a single IFD/image from a TIFF file.
+  */
+ typedef struct {
+-    TIFFDirEntry	SubFileType;
+-    TIFFDirEntry	ImageWidth;
+-    TIFFDirEntry	ImageLength;
+-    TIFFDirEntry	BitsPerSample;
+-    TIFFDirEntry	Compression;
+-    TIFFDirEntry	Photometric;
+-    TIFFDirEntry	FillOrder;
+-    TIFFDirEntry	StripOffsets;
+-    TIFFDirEntry	Orientation;
+-    TIFFDirEntry	SamplesPerPixel;
+-    TIFFDirEntry	RowsPerStrip;
+-    TIFFDirEntry	StripByteCounts;
+-    TIFFDirEntry	XResolution;
+-    TIFFDirEntry	YResolution;
+-    TIFFDirEntry	Options;		// T4 or T6
+-    TIFFDirEntry	ResolutionUnit;
+-    TIFFDirEntry	PageNumber;
+-    TIFFDirEntry	BadFaxLines;
+-    TIFFDirEntry	CleanFaxData;
+-    TIFFDirEntry	ConsecutiveBadFaxLines;
++    HFClassicTIFFDirEntry	SubFileType;
++    HFClassicTIFFDirEntry	ImageWidth;
++    HFClassicTIFFDirEntry	ImageLength;
++    HFClassicTIFFDirEntry	BitsPerSample;
++    HFClassicTIFFDirEntry	Compression;
++    HFClassicTIFFDirEntry	Photometric;
++    HFClassicTIFFDirEntry	FillOrder;
++    HFClassicTIFFDirEntry	StripOffsets;
++    HFClassicTIFFDirEntry	Orientation;
++    HFClassicTIFFDirEntry	SamplesPerPixel;
++    HFClassicTIFFDirEntry	RowsPerStrip;
++    HFClassicTIFFDirEntry	StripByteCounts;
++    HFClassicTIFFDirEntry	XResolution;
++    HFClassicTIFFDirEntry	YResolution;
++    HFClassicTIFFDirEntry	Options;		// T4 or T6
++    HFClassicTIFFDirEntry	ResolutionUnit;
++    HFClassicTIFFDirEntry	PageNumber;
++    HFClassicTIFFDirEntry	BadFaxLines;
++    HFClassicTIFFDirEntry	CleanFaxData;
++    HFClassicTIFFDirEntry	ConsecutiveBadFaxLines;
+     uint32		link;			// offset to next directory
+     uint32		xres[2];		// X resolution indirect value
+     uint32		yres[2];		// Y resolution indirect value
+@@ -226,10 +204,10 @@
+ 		 * amount of image data and then adding in
+ 		 * the expected data for the TIFF headers.
+ 		 */
+-		uint32* sb;
++		TIFFSTRIPBYTECOUNTS* sb;
+ 		TIFFGetField(tif, TIFFTAG_STRIPBYTECOUNTS, &sb);
+ 		file_size = sizeof (DirTemplate) +
+-		    sizeof (TIFFHeader) + sizeof (uint16);
++		    sizeof (TIFFHEADER) + sizeof (uint16);
+ 		for (tstrip_t s = 0, ns = TIFFNumberOfStrips(tif); s < ns; s++)
+ 		    file_size += sb[s];
+ 		reply(code, "%s for %s (%lu bytes).",
+@@ -261,10 +239,10 @@
+ 	if (fd >= 0) {
+ 	    union {
+ 		char buf[512];
+-		TIFFHeader h;
++		TIFFHEADER h;
+ 	    } b;
+ 	    ssize_t cc = Sys::read(fd, (char*) &b, sizeof (b));
+-	    if (cc > (ssize_t)sizeof (b.h) && b.h.tiff_version == TIFF_VERSION &&
++	    if (cc > (ssize_t)sizeof (b.h) && b.h.tiff_version == TIFFVERSION &&
+ 	      (b.h.tiff_magic == TIFF_BIGENDIAN ||
+ 	       b.h.tiff_magic == TIFF_LITTLEENDIAN)) {
+ 		(void) lseek(fd, 0L, SEEK_SET);		// rewind
+@@ -318,12 +296,12 @@
+ }
+ 
+ static void
+-getLong(TIFF* tif, TIFFDirEntry& de)
++getLong(TIFF* tif, HFClassicTIFFDirEntry& de)
+ {
+     TIFFGetField(tif, de.tdir_tag, &de.tdir_offset);
+ }
+ static void
+-getShort(TIFF* tif, TIFFDirEntry& de)
++getShort(TIFF* tif, HFClassicTIFFDirEntry& de)
+ {
+     uint16 v;
+     TIFFGetField(tif, de.tdir_tag, &v);
+@@ -343,7 +321,7 @@
+ {
+     static DirTemplate templ = {
+ #define	TIFFdiroff(v) \
+-    (uint32) (sizeof (TIFFHeader) + sizeof (uint16) + \
++    (uint32) (sizeof (TIFFHEADER) + sizeof (uint16) + \
+       (intptr_t) &(((DirTemplate*) 0)->v))
+ 	{ TIFFTAG_SUBFILETYPE,		TIFF_LONG,	1 },
+ 	{ TIFFTAG_IMAGEWIDTH,		TIFF_LONG,	1 },
+@@ -368,7 +346,7 @@
+ 	0,					// next directory
+ 	{ 0, 1 }, { 0, 1 },			// x+y resolutions
+     };
+-#define	NTAGS	((TIFFdiroff(link)-TIFFdiroff(SubFileType)) / sizeof (TIFFDirEntry))
++#define	NTAGS	((TIFFdiroff(link)-TIFFdiroff(SubFileType)) / sizeof (HFClassicTIFFDirEntry))
+     /*
+      * Construct the TIFF header for this IFD using
+      * the preconstructed template above.  We extract
+@@ -377,14 +355,14 @@
+      * of things about the contents of the TIFF file.
+      */
+     struct {
+-	TIFFHeader h;
++	TIFFHEADER h;
+ 	uint16	dircount;
+ 	u_char	dirstuff[sizeof (templ)];
+     } buf;
+     union { int32 i; char c[4]; } u; u.i = 1;
+     buf.h.tiff_magic = (u.c[0] == 0 ? TIFF_BIGENDIAN : TIFF_LITTLEENDIAN);
+-    buf.h.tiff_version = TIFF_VERSION;
+-    buf.h.tiff_diroff = sizeof (TIFFHeader);
++    buf.h.tiff_version = TIFFVERSION;
++    buf.h.tiff_diroff = sizeof (TIFFHEADER);
+     buf.dircount = (uint16) NTAGS;
+     getLong(tif, templ.SubFileType);
+     getLong(tif, templ.ImageWidth);
+@@ -412,7 +390,7 @@
+     getShort(tif, templ.CleanFaxData);
+     getLong(tif, templ.ConsecutiveBadFaxLines);
+     if (buf.h.tiff_magic == TIFF_BIGENDIAN) {
+-	TIFFDirEntry* dp = &templ.SubFileType;
++	HFClassicTIFFDirEntry* dp = &templ.SubFileType;
+ 	for (u_int i = 0; i < NTAGS; i++) {
+ 	    if (dp->tdir_type == TIFF_SHORT)
+ 		dp->tdir_offset <<= 16;
+@@ -441,7 +419,7 @@
+ bool
+ HylaFAXServer::sendITIFFData(TIFF* tif, int fdout)
+ {
+-    uint32* sb;
++    TIFFSTRIPBYTECOUNTS* sb;
+     (void) TIFFGetField(tif, TIFFTAG_STRIPBYTECOUNTS, &sb);
+     tdata_t buf = _TIFFmalloc(sb[0]);
+     tsize_t bsize = sb[0];
+--- hylafax-6.0.5/hfaxd/FileTransfer.c++	2012-01-28 15:27:47.000000000 -0500
++++ hylafax-5.5.1/hfaxd/FileTransfer.c++	2012-01-28 15:30:12.000000000 -0500
+@@ -69,7 +69,7 @@
+ 
+ 
+ static bool
+-isTIFF(const TIFFHeader& h)
++isTIFF(const TIFFHEADER& h)
+ {
+     if (h.tiff_magic != TIFF_BIGENDIAN && h.tiff_magic != TIFF_LITTLEENDIAN)
+ 	return (false);
+@@ -82,11 +82,23 @@
+     // byte swap version stamp if opposite byte order
+     if ((u.c[0] == 0) ^ (h.tiff_magic == TIFF_BIGENDIAN))
+ 	TIFFSwabShort(&version);
+-    return (version == TIFF_VERSION);
++    return (version == TIFFVERSION);
+ }
+ 
+ 
+ /*
++ * This is copied right from tiff.h in version 3.8.2.  This was necessary
++ * to localize here because it was removed from tiff.h in version 4.0.
++ * In tiff.h 3.8.2 it was known as "TIFFDirEntry".
++ */
++typedef struct {
++	uint16		tdir_tag;
++	uint16		tdir_type;	/* data type */
++	uint32		tdir_count;	/* number of items; length in spec */
++	uint32		tdir_offset;	/* byte offset to field data */
++} HFClassicTIFFDirEntry;
++ 
++/*
+  * Record a file transfer in the log file.
+  */
+ void
+@@ -957,7 +957,7 @@
+ 	if (FileCache::lookup(docname, sb) && S_ISREG(sb.st_mode)) {
+ 	    union {
+ 		char buf[512];
+-		TIFFHeader h;
++		TIFFHEADER h;
+ 	    } b;
+ 	    ssize_t cc = Sys::read(fd, (char*) &b, sizeof (b));
+ 	    if (cc > 2 && b.buf[0] == '%' && b.buf[1] == '!')
diff --git a/staging/hylafax/hylafax.cron.daily b/staging/hylafax/hylafax.cron.daily
new file mode 100644
index 000000000..2d1a77e5c
--- /dev/null
+++ b/staging/hylafax/hylafax.cron.daily
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+/usr/sbin/faxqclean
+/usr/sbin/faxcron -rcv 30
diff --git a/staging/hylafax/hylafax.install b/staging/hylafax/hylafax.install
new file mode 100644
index 000000000..5dacf4045
--- /dev/null
+++ b/staging/hylafax/hylafax.install
@@ -0,0 +1,46 @@
+
+print_install() {
+  printf "\n"
+  echo "Add the following to /etc/inittab and run telinit q"
+  echo "  f1:2345:respawn:/usr/lib/fax/faxgetty ttyS0"
+  echo "faxgetty should now be running"
+  printf "\n"
+  echo "Run faxsetup to configure and be sure to set..."
+  echo "  The device to configure is usually ttyS0"
+  echo "  The number of pages to accept to more than 25"
+  echo "  The country code and area code"
+  echo "  The faxclass to 2.0"
+  echo "  Most other defaults are OK"
+  printf "\n"
+}
+
+print_remove() {
+  printf "\n\n"
+  echo "You may manually remove /var/spool/hylafax and /usr/lib/fax if you do not need anything."
+  echo "You may also remove any aliases added to /etc/mail/aliases."
+  printf "\n"
+}
+
+post_install() {
+  post_upgrade
+  print_install
+}
+
+post_upgrade() {
+  groupadd -g 14 uucp &>/dev/null
+  useradd -u 10 -g uucp -d '/' -s /bin/false uucp &>/dev/null
+  useradd -u 69 -g daemon -d '/' -s /bin/false fax &>/dev/null
+  chown uucp /var/spool/hylafax/{,archive,bin,client,config,dev,docq,doneq,etc}
+  chown uucp /var/spool/hylafax/{FIFO,info,log,pollq,recvq,sendq,status,tmp}
+  chown uucp /var/spool/hylafax/etc/{hosts.hfaxd,lutRS18.pcf,xferfaxlog}
+  chown -R uucp /var/spool/hylafax/etc/templates
+  usermod -d '/' uucp &>/dev/null
+  usermod -d '/' fax &>/dev/null
+}
+
+pre_remove() {
+  userdel uucp &>/dev/null
+  groupdel uucp &>/dev/null
+  userdel fax &>/dev/null
+  print_remove
+}
diff --git a/staging/metacity/PKGBUILD b/staging/metacity/PKGBUILD
new file mode 100644
index 000000000..fcd149581
--- /dev/null
+++ b/staging/metacity/PKGBUILD
@@ -0,0 +1,34 @@
+# $Id: PKGBUILD 147952 2012-01-29 03:06:23Z eric $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgname=metacity
+pkgver=2.34.1
+pkgrel=2
+pkgdesc="A window manager for GNOME"
+arch=(i686 x86_64)
+license=('GPL')
+depends=('startup-notification' 'gconf' 'zenity' 'libcanberra' 'libgtop' 'libwnck' 'libsm')
+makedepends=('intltool' 'pkg-config' 'gnome-doc-utils')
+url="http://www.gnome.org"
+groups=('gnome')
+options=('!libtool' '!emptydirs')
+install=metacity.install
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('f144cb43925ca00d8eaac129a14df3260c54a32324b5cd0a4d78b0fd7ff1028a')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr --sysconfdir=/etc \
+      --libexecdir=/usr/lib/metacity \
+      --localstatedir=/var --disable-static
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
+
+  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
+  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain metacity "${pkgdir}"/etc/gconf/schemas/*.schemas
+  rm -f "${pkgdir}"/etc/gconf/schemas/*.schemas
+}
diff --git a/staging/metacity/metacity.install b/staging/metacity/metacity.install
new file mode 100644
index 000000000..2eb1e5094
--- /dev/null
+++ b/staging/metacity/metacity.install
@@ -0,0 +1,17 @@
+pkgname=metacity
+
+post_install() {
+  usr/sbin/gconfpkg --install ${pkgname}
+}
+
+pre_upgrade() {
+  pre_remove $1
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  usr/sbin/gconfpkg --uninstall ${pkgname}
+}
diff --git a/staging/python-notify/PKGBUILD b/staging/python-notify/PKGBUILD
new file mode 100644
index 000000000..b00e72a84
--- /dev/null
+++ b/staging/python-notify/PKGBUILD
@@ -0,0 +1,43 @@
+# $Id: PKGBUILD 147960 2012-01-29 04:17:35Z angvp $
+# Maintainer: Angel Velasquez <angvp@archlinux.org>
+# Contributor: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com>
+# Contributor: Mario Danic <mario.danic@gmail.com>
+# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
+pkgname=python-notify
+pkgver=0.1.1
+pkgrel=11
+pkgdesc="Python bindings for libnotify"
+arch=('i686' 'x86_64')
+url="http://www.galago-project.org/"
+license=('GPL')
+depends=('pygtk>=2.22.0' 'libnotify>=0.7.1')
+makedepends=('pkgconfig' 'python2')
+options=(!libtool)
+source=(http://www.galago-project.org/files/releases/source/notify-python/notify-python-${pkgver}.tar.gz
+        libnotify07.patch
+        notify-python-0.1.1-fix-GTK-symbols.patch)
+md5sums=('8f0ef0939cc8edd2efd896ce5ba80cf4'
+         'b40c4542575d5aef559908fe60a21634'
+         'c6922028da5951e69a6a0167bdb4461c')
+
+build() {
+    cd ${srcdir}/notify-python-${pkgver}
+
+    patch -Np1 -i ${srcdir}/libnotify07.patch
+    patch -Np1 -i ${srcdir}/notify-python-0.1.1-fix-GTK-symbols.patch
+
+    ./configure --prefix=/usr
+
+    # WARNING - we touch src/pynotify.override in build because upstream did not rebuild pynotify.c
+    # from the input definitions, this forces pynotify.c to be regenerated, at some point this can be removed
+    touch src/pynotify.override
+
+    make clean
+    make
+}
+
+package() {
+    cd ${srcdir}/notify-python-${pkgver}
+    make DESTDIR=${pkgdir} install
+}
diff --git a/staging/python-notify/libnotify07.patch b/staging/python-notify/libnotify07.patch
new file mode 100644
index 000000000..289573d50
--- /dev/null
+++ b/staging/python-notify/libnotify07.patch
@@ -0,0 +1,36 @@
+diff -up notify-python-0.1.1/src/pynotify.defs.notify070 notify-python-0.1.1/src/pynotify.defs
+--- notify-python-0.1.1/src/pynotify.defs.notify070	2010-11-02 17:11:14.928179237 -0400
++++ notify-python-0.1.1/src/pynotify.defs	2010-11-02 17:11:51.153180231 -0400
+@@ -38,7 +38,6 @@
+     '("const-gchar*" "summary")
+     '("const-gchar*" "message" (null-ok) (default "NULL"))
+     '("const-gchar*" "icon" (null-ok) (default "NULL"))
+-    '("GtkWidget*" "attach" (null-ok) (default "NULL"))
+   )
+ )
+ 
+@@ -53,24 +52,6 @@
+   )
+ )
+ 
+-(define-method attach_to_widget
+-  (of-object "NotifyNotification")
+-  (c-name "notify_notification_attach_to_widget")
+-  (return-type "none")
+-  (parameters
+-    '("GtkWidget*" "attach")
+-  )
+-)
+-
+-(define-method attach_to_status_icon
+-  (of-object "NotifyNotification")
+-  (c-name "notify_notification_attach_to_status_icon")
+-  (return-type "none")
+-  (parameters
+-    '("GtkStatusIcon*" "attach")
+-  )
+-)
+-
+ (define-method show
+   (of-object "NotifyNotification")
+   (c-name "notify_notification_show")
diff --git a/staging/python-notify/notify-python-0.1.1-fix-GTK-symbols.patch b/staging/python-notify/notify-python-0.1.1-fix-GTK-symbols.patch
new file mode 100644
index 000000000..f985c0136
--- /dev/null
+++ b/staging/python-notify/notify-python-0.1.1-fix-GTK-symbols.patch
@@ -0,0 +1,25 @@
+diff -up notify-python-0.1.1/src/__init__.py.BAD notify-python-0.1.1/src/__init__.py
+--- notify-python-0.1.1/src/__init__.py.BAD	2010-08-31 09:04:45.353844005 -0400
++++ notify-python-0.1.1/src/__init__.py	2010-08-31 09:04:49.281844300 -0400
+@@ -1 +1,21 @@
++"""
++Fedora's libnotify.so is not linked against GTK2 or GTK3. The idea
++was to support being linked against different parallel-installable
++GTK stacks.
++
++Unfortunately, python needs to jump through some special hoops in order
++to share symbols with extension modules, specifically, pygtk, which does
++link against GTK2.
++
++Without using sys.setdlopenflags(sys.getdlopenflags() | ctypes.RTLD_GLOBAL),
++the result is:
++libnotify-WARNING **: Missing symbol 'gdk_screen_make_display_name'
++
++Thanks to David Malcolm for figuring out the workaround.
++"""
++import ctypes
++import sys
++sys.setdlopenflags(sys.getdlopenflags() | ctypes.RTLD_GLOBAL)
++import gtk
++
+ from _pynotify import *
diff --git a/staging/python-pygame/ChangeLog b/staging/python-pygame/ChangeLog
new file mode 100644
index 000000000..566be3f65
--- /dev/null
+++ b/staging/python-pygame/ChangeLog
@@ -0,0 +1,34 @@
+2012-01-24  Angel Velasquez <angvp@archlinux.org>
+
+	* Rebuilt against libpng 1.5
+
+2010-08-24  Eric Belanger  <eric@archlinux.org>
+
+	* Rebuilt for python2
+
+2009-08-06  Douglas Soares de Andrade  <douglas@archlinux.org>
+
+	* Updated to: 1.9.1
+
+2009-08-03  Douglas Soares de Andrade  <douglas@archlinux.org>
+
+	* Adding the examples folder
+
+2009-08-01  Douglas Soares de Andrade  <douglas@archlinux.org>
+
+	* Updated for x86_64: 1.9.0
+
+2008-08-06  Eric Belanger  <eric@archlinux.org>
+
+	* python-pygame 1.8.1-2
+	* Fixed file permissions (close FS#11082)
+
+2008-07-31  Douglas Soares de Andrade  <douglas@archlinux.org>
+
+	* Updated for i686: 1.8.1
+
+2008-03-31  Eric Belanger  <eric@archlinux.org>
+
+	* python-pygame 1.8.0-1
+	* Upstream update
+	* Added ChangeLog
diff --git a/staging/python-pygame/PKGBUILD b/staging/python-pygame/PKGBUILD
new file mode 100644
index 000000000..20b37e9ac
--- /dev/null
+++ b/staging/python-pygame/PKGBUILD
@@ -0,0 +1,40 @@
+# $Id: PKGBUILD 147958 2012-01-29 04:08:03Z angvp $
+# Maintainer: Angel Velasquez <angvp@archlinux.org> 
+# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
+# Contributor: Eric Belanger <eric@archlinux.org>
+# Contributor: john(?)
+# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
+pkgname=python-pygame
+pkgver=1.9.1
+pkgrel=4
+pkgdesc="Python game library"
+arch=('i686' 'x86_64')
+url="http://www.pygame.org/"
+license=('LGPL')
+depends=('sdl_mixer' 'libvorbis' 'sdl_ttf' 'sdl_image' 'smpeg')
+makedepends=('python2' 'portmidi') 
+replaces=('pygame')
+provides=('pygame')
+changelog=ChangeLog
+source=(http://pygame.org/ftp/pygame-${pkgver}release.tar.gz 'config.patch'
+'pygame-v4l.patch')
+md5sums=('1c4cdc708d17c8250a2d78ef997222fc'
+         'aaa668f3cd710d8604114501ea6a6f48'
+         '9915b63865c16519e80007909beed876')
+
+build() {
+	cd "${srcdir}/pygame-${pkgver}release"
+	patch -Np0 -i "${srcdir}/config.patch"
+    patch -Np1 -i "${srcdir}/pygame-v4l.patch"
+}
+
+package() {
+	cd "${srcdir}/pygame-${pkgver}release"
+	python2 config.py -auto
+	python2 setup.py install --root="${pkgdir}" --prefix=/usr
+	# Copying the examples and tests
+	cp -R examples lib/* "${pkgdir}/usr/lib/python2.7/site-packages/pygame"
+	cp -R test/* "${pkgdir}/usr/lib/python2.7/site-packages/pygame/tests"
+	# Fixing permissions
+	chmod 644 "${pkgdir}"/usr/include/python2.7/pygame/*
+}
diff --git a/staging/python-pygame/config.patch b/staging/python-pygame/config.patch
new file mode 100644
index 000000000..b3dab162c
--- /dev/null
+++ b/staging/python-pygame/config.patch
@@ -0,0 +1,26 @@
+Index: config_unix.py
+===================================================================
+--- config_unix.py	(revision 2567)
++++ config_unix.py	(working copy)
+@@ -174,7 +174,7 @@
+ 
+     for d in DEPS[1:]:
+         if not d.found:
+-            if not confirm("""
++            if "-auto" not in sys.argv and not confirm("""
+ Warning, some of the pygame dependencies were not found. Pygame can still
+ compile and install, but games that depend on those missing dependencies
+ will not run. Would you like to continue the configuration?"""):
+Index: config_msys.py
+===================================================================
+--- config_msys.py	(revision 2567)
++++ config_msys.py	(working copy)
+@@ -283,7 +283,7 @@
+     
+     for d in DEPS[1:]:
+         if not d.found:
+-            if not confirm("""
++            if "-auto" not in sys.argv and not confirm("""
+ Warning, some of the pygame dependencies were not found. Pygame can still
+ compile and install, but games that depend on those missing dependencies
+ will not run. Would you like to continue the configuration?"""):
diff --git a/staging/python-pygame/pygame-v4l.patch b/staging/python-pygame/pygame-v4l.patch
new file mode 100644
index 000000000..3b5a2b9d2
--- /dev/null
+++ b/staging/python-pygame/pygame-v4l.patch
@@ -0,0 +1,88 @@
+diff -crB pygame-1.9.1release/Setup.in pygame-1.9.1release-v4lpatch//Setup.in
+*** pygame-1.9.1release/Setup.in	Thu Jul  2 06:41:56 2009
+--- pygame-1.9.1release-v4lpatch//Setup.in	Thu Mar 24 17:31:22 2011
+***************
+*** 34,40 ****
+  _numericsndarray src/_numericsndarray.c $(SDL) $(MIXER) $(DEBUG)
+  movie src/movie.c $(SDL) $(SMPEG) $(DEBUG)
+  scrap src/scrap.c $(SDL) $(SCRAP) $(DEBUG)
+! _camera src/_camera.c src/camera_v4l2.c src/camera_v4l.c $(SDL) $(DEBUG)
+  pypm src/pypm.c $(SDL) $(PORTMIDI) $(PORTTIME) $(DEBUG)
+  
+  GFX = src/SDL_gfx/SDL_gfxPrimitives.c 
+--- 34,40 ----
+  _numericsndarray src/_numericsndarray.c $(SDL) $(MIXER) $(DEBUG)
+  movie src/movie.c $(SDL) $(SMPEG) $(DEBUG)
+  scrap src/scrap.c $(SDL) $(SCRAP) $(DEBUG)
+! _camera src/_camera.c src/camera_v4l2.c $(SDL) $(DEBUG)
+  pypm src/pypm.c $(SDL) $(PORTMIDI) $(PORTTIME) $(DEBUG)
+  
+  GFX = src/SDL_gfx/SDL_gfxPrimitives.c 
+diff -crB pygame-1.9.1release/src/_camera.c pygame-1.9.1release-v4lpatch//src/_camera.c
+*** pygame-1.9.1release/src/_camera.c	Sun Mar 15 20:30:41 2009
+--- pygame-1.9.1release-v4lpatch//src/_camera.c	Thu Mar 24 16:58:18 2011
+***************
+*** 160,179 ****
+  {
+  #if defined(__unix__)
+      if (v4l2_open_device(self) == 0) {
+!         if (v4l_open_device(self) == 0) {
+!             v4l2_close_device(self);
+!             return NULL;
+!         } else {
+!             self->camera_type = CAM_V4L;
+!             if (v4l_init_device(self) == 0) {
+!                 v4l2_close_device(self);
+!                 return NULL;
+!             }
+!             if (v4l_start_capturing(self) == 0) {
+!                 v4l2_close_device(self);
+!                 return NULL;
+!             }
+!         }
+      } else {
+          self->camera_type = CAM_V4L2;
+          if (v4l2_init_device(self) == 0) {
+--- 160,167 ----
+  {
+  #if defined(__unix__)
+      if (v4l2_open_device(self) == 0) {
+! 	v4l2_close_device(self);
+!         return NULL;
+      } else {
+          self->camera_type = CAM_V4L2;
+          if (v4l2_init_device(self) == 0) {
+diff -crB pygame-1.9.1release/src/camera.h pygame-1.9.1release-v4lpatch//src/camera.h
+*** pygame-1.9.1release/src/camera.h	Fri Oct 10 04:37:10 2008
+--- pygame-1.9.1release-v4lpatch//src/camera.h	Thu Mar 24 16:44:32 2011
+***************
+*** 39,45 ****
+  
+      #include <asm/types.h>          /* for videodev2.h */
+  
+-     #include <linux/videodev.h>
+      #include <linux/videodev2.h>
+  #endif
+  
+--- 39,44 ----
+***************
+*** 51,57 ****
+  #define RGB_OUT 1
+  #define YUV_OUT 2
+  #define HSV_OUT 4
+- #define CAM_V4L 1
+  #define CAM_V4L2 2
+  
+  struct buffer 
+--- 50,55 ----
+***************
+*** 111,118 ****
+  int v4l2_close_device (PyCameraObject* self);
+  int v4l2_open_device (PyCameraObject* self);
+  
+- /* internal functions specific to v4l */
+- int v4l_open_device (PyCameraObject* self);
+- int v4l_init_device(PyCameraObject* self);
+- int v4l_start_capturing(PyCameraObject* self);
+  #endif
+--- 109,112 ----
diff --git a/staging/pywebkitgtk/PKGBUILD b/staging/pywebkitgtk/PKGBUILD
new file mode 100644
index 000000000..792ef185c
--- /dev/null
+++ b/staging/pywebkitgtk/PKGBUILD
@@ -0,0 +1,27 @@
+# $Id: PKGBUILD 147954 2012-01-29 03:55:38Z angvp $
+# Maintainer: Angel Velasquez <angvp@archlinux.org>  
+# Contributor: kasa <biuta.jr@gmail.com>
+# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
+
+pkgname=pywebkitgtk
+pkgver=1.1.8
+pkgrel=2
+pkgdesc="Python bindings to the WebKit GTK+ port"
+arch=('i686' 'x86_64')
+url="http://code.google.com/p/pywebkitgtk/"
+license=('LGPL')
+depends=('libwebkit' 'pygtk')
+options=('!libtool' '!makeflags')
+source=(http://pywebkitgtk.googlecode.com/files/${pkgname}-${pkgver}.tar.gz)
+md5sums=('158335385354ba38090c9324b37bf225')
+
+build() {
+    cd ${srcdir}/${pkgname}-${pkgver}
+    ./configure --prefix=/usr
+    make
+}
+
+package() {
+    cd ${srcdir}/${pkgname}-${pkgver}
+    make DESTDIR=${pkgdir} install
+}