3 files changed, 18 insertions, 21 deletions
diff --git a/pcr/gxmessage2/PKGBUILD b/pcr/gxmessage-gtk2/PKGBUILD
index 180edee04..f3f19335b 100644
--- a/pcr/gxmessage2/PKGBUILD
+++ b/pcr/gxmessage-gtk2/PKGBUILD
@@ -1,33 +1,28 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-# Maintainer (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer (Arch): Geoffroy Carrier <geoffroy.carrier@koon.fr>
+# Maintainer (Arch): Brian Bidulock <bidulock@openss7.org>
+# Contributor (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor (Arch): Geoffroy Carrier <geoffroy.carrier@koon.fr>
 # Contributor (Arch): Jaroslav Lichtblau <tu@dragonlord.cz>
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
 
+pkgname=gxmessage-gtk2
 _pkgname=gxmessage
 pkgver=2.20.1
-
-pkgname=$_pkgname${pkgver%%.*}
-conflicts=("$_pkgname")
-provides=("$_pkgname=$pkgver")
-pkgrel=1
-pkgdesc="A GTK+${pkgver%%.*} based xmessage clone."
+pkgrel=1.1
+pkgdesc="A GTK2 based xmessage clone for GTK2."
 arch=('i686' 'x86_64')
 url="http://homepages.ihug.co.nz/~trmusson/programs.html#gxmessage"
 license=('GPL')
-depends=("gtk${pkgver%%.*}" 'desktop-file-utils')
+depends=('gtk2' 'desktop-file-utils')
 makedepends=('pkgconfig' 'intltool')
+provides=("$_pkgname")
+conflicts=("$_pkgname")
 install=$_pkgname.install
-source=(https://ftp.gnu.org/pub/gnu/$_pkgname/$_pkgname-${pkgver}.tar.gz{,.sig}
-        $_pkgname.desktop.in)
-md5sums=('45428121eb08db8472fc378dc93d171d'
-         'SKIP'
-         '03272ac913cd91437912002c5a7e4fe5')
+source=(http://homepages.ihug.co.nz/~trmusson/stuff/$_pkgname-$pkgver.tar.gz
+        $_pkgname.desktop)
+md5sums=('f4160442548bdd90895b008b85df0f6e'
+         'af92506581c1aae70e3845a66a983f22')
 
 build() {
-  cd "$srcdir"
-  sed "s|@toolkit@|GTK+${pkgver%%.*}|g" \
-    < gxmessage.desktop.in \
-    > gxmessage.desktop
   cd "$srcdir/$_pkgname-$pkgver"
   ./configure --prefix=/usr --mandir=/usr/share/man
   make
@@ -39,3 +34,5 @@ package() {
   install -D -m644 "$srcdir/$_pkgname.desktop" \
     "${pkgdir}/usr/share/applications/$_pkgname.desktop"
 }
+md5sums=('45428121eb08db8472fc378dc93d171d'
+         'af92506581c1aae70e3845a66a983f22')
diff --git a/pcr/gxmessage2/gxmessage.desktop.in b/pcr/gxmessage-gtk2/gxmessage.desktop
index 4c65512b6..f569431ff 100644
--- a/pcr/gxmessage2/gxmessage.desktop.in
+++ b/pcr/gxmessage-gtk2/gxmessage.desktop
@@ -2,8 +2,8 @@
 Type=Application
 Name=Gxmessage
 GenericName=gxmessage
-Comment=A @toolkit@ based xmessage clone.
-Comment[cs]=Klon xmessage postavený na knihovně @toolkit@.
+Comment=A GTK2 based xmessage clone.
+Comment[cs]=Klon xmessage postavený na knihovně GTK2.
 Icon=gxmessage
 Exec=gxmessage
 Terminal=false
diff --git a/pcr/gxmessage2/gxmessage.install b/pcr/gxmessage-gtk2/gxmessage.install
index de3e0f510..de3e0f510 100644
--- a/pcr/gxmessage2/gxmessage.install
+++ b/pcr/gxmessage-gtk2/gxmessage.install