Fixed previous commit. Also cleanup. Removed internalization from panel .desktop files.

18 files changed, 61 insertions, 104 deletions

diff --git a/xfce4-corner-plugin/Pkgfile b/xfce4-corner-plugin/Pkgfile
index 1e9c474..853cfeb 100644
--- a/xfce4-corner-plugin/Pkgfile
+++ b/xfce4-corner-plugin/Pkgfile
@@ -6,7 +6,7 @@
 
 name=xfce4-corner-plugin 
 version=1.0.1
-release=3
+release=4
 source=(http://aur.archlinux.org/packages/${name}/${name}.tar.gz) 
 
 build() {
@@ -15,8 +15,7 @@ build() {
     ${CFLAGS} ${LDFLAGS} -o ${name} ${name}.c
   sed 's|/usr/libexec|/usr/lib|' -i ${name}.desktop
   install -D -m 0755 ${name} ${PKG}/usr/lib/xfce4/panel-plugins/${name}
-  install -D -m 0644 ${name}.desktop $PKG/usr/share/xfce4/panel-plugins/${name}.desktop 
+  install -D -m 0644 ${name}.desktop $PKG/usr/share/xfce4/panel-plugins/${name}.desktop
+  find ${PKG}/usr/share/xfce4/panel-plugins -type f -name '*.desktop' \
+    -exec sed -r '/^(Comment|Name)\[/d' -i {} \;
 }
-find ${PKG}/usr/share/xfce4/panel-plugins -type f -name '*.desktop' -exec sed -e '/^Comment\[/d' -e '/^Name\[/d' -i {} \;
-find ${PKG}/usr/share/xfce4/panel-plugins -type f -name '*.desktop' -exec sed -e '/^Comment\[/d' -e '/^Name\[/d' -i {} \;
-find ${PKG}/usr/share/xfce4/panel-plugins -type f -name '*.desktop' -exec sed -r '/^(Comment|Name)\[/d' -i {} \;
diff --git a/xfce4-dict-plugin/Pkgfile b/xfce4-dict-plugin/Pkgfile
index 614434e..8999c95 100644
--- a/xfce4-dict-plugin/Pkgfile
+++ b/xfce4-dict-plugin/Pkgfile
@@ -7,7 +7,7 @@
 
 name=xfce4-dict-plugin
 version=0.2.1
-release=1
+release=2
 source=(http://goodies.xfce.org/releases/${name}/${name}-${version}.tar.bz2)
 
 build() {
@@ -19,7 +19,6 @@ build() {
   make
   make DESTDIR=${PKG} install
   rm -rf ${PKG}/usr/share/locale
+  find ${PKG}/usr/share/xfce4/panel-plugins -type f -name '*.desktop' \
+    -exec sed -r '/^(Comment|Name)\[/d' -i {} \;
 }
-find ${PKG}/usr/share/xfce4/panel-plugins -type f -name '*.desktop' -exec sed -e '/^Comment\[/d' -e '/^Name\[/d' -i {} \;
-find ${PKG}/usr/share/xfce4/panel-plugins -type f -name '*.desktop' -exec sed -e '/^Comment\[/d' -e '/^Name\[/d' -i {} \;
-find ${PKG}/usr/share/xfce4/panel-plugins -type f -name '*.desktop' -exec sed -r '/^(Comment|Name)\[/d' -i {} \;
diff --git a/xfce4-fsguard-plugin/Pkgfile b/xfce4-fsguard-plugin/Pkgfile
index e28e0cd..ba94296 100644
--- a/xfce4-fsguard-plugin/Pkgfile
+++ b/xfce4-fsguard-plugin/Pkgfile
@@ -7,17 +7,18 @@
 
 name=xfce4-fsguard-plugin
 version=0.4.0
-release=1
+release=2
 source=(http://goodies.xfce.org/releases/${name}/${name}-${version}.tar.bz2)
 
 build() {
   cd ${name}-${version}
   autoconf
-  ./configure --prefix=/usr               --libexecdir=/usr/lib               --disable-debug
+  ./configure --prefix=/usr \
+              --libexecdir=/usr/lib \
+              --disable-debug
   make
   make DESTDIR=${PKG} install
   rm -rf ${PKG}/usr/share/locale
+  find ${PKG}/usr/share/xfce4/panel-plugins -type f -name '*.desktop' \
+    -exec sed -r '/^(Comment|Name)\[/d' -i {} \;
 }
-find ${PKG}/usr/share/xfce4/panel-plugins -type f -name '*.desktop' -exec sed -e '/^Comment\[/d' -e '/^Name\[/d' -i {} \;
-find ${PKG}/usr/share/xfce4/panel-plugins -type f -name '*.desktop' -exec sed -e '/^Comment\[/d' -e '/^Name\[/d' -i {} \;
-find ${PKG}/usr/share/xfce4/panel-plugins -type f -name '*.desktop' -exec sed -r '/^(Comment|Name)\[/d' -i {} \;
diff --git a/xfce4-macmenu-plugin/Pkgfile b/xfce4-macmenu-plugin/Pkgfile
index c1c5517..4d44596 100644
--- a/xfce4-macmenu-plugin/Pkgfile
+++ b/xfce4-macmenu-plugin/Pkgfile
@@ -19,7 +19,6 @@ build() {
   sed 's|/usr/lib/xfce4|/usr/lib|' -i ${name}.desktop
   install -D -m 0755 ${name} ${PKG}/usr/lib/xfce4/panel-plugins/${name}
   install -D -m 0655 ${name}.desktop ${PKG}/usr/share/xfce4/panel-plugins/${name}.desktop
+  find ${PKG}/usr/share/xfce4/panel-plugins -type f -name '*.desktop' \
+    -exec sed -r '/^(Comment|Name)\[/d' -i {} \;
 }
-find ${PKG}/usr/share/xfce4/panel-plugins -type f -name '*.desktop' -exec sed -e '/^Comment\[/d' -e '/^Name\[/d' -i {} \;
-find ${PKG}/usr/share/xfce4/panel-plugins -type f -name '*.desktop' -exec sed -e '/^Comment\[/d' -e '/^Name\[/d' -i {} \;
-find ${PKG}/usr/share/xfce4/panel-plugins -type f -name '*.desktop' -exec sed -r '/^(Comment|Name)\[/d' -i {} \;
diff --git a/xfce4-mixer/Pkgfile b/xfce4-mixer/Pkgfile
index d7e0305..7c484e8 100644
--- a/xfce4-mixer/Pkgfile
+++ b/xfce4-mixer/Pkgfile
@@ -6,7 +6,7 @@
 
 name=xfce4-mixer
 version=4.4.2
-release=1
+release=2
 source=(http://www.xfce.org/archive/xfce-$version/src/$name-$version.tar.bz2)
 
 build () {
@@ -19,7 +19,6 @@ build () {
     make -j1
     make DESTDIR=$PKG install
     rm -rf $PKG/usr/share/locale
+    find ${PKG}/usr/share/xfce4/panel-plugins -type f -name '*.desktop' \
+      -exec sed -r '/^(Comment|Name)\[/d' -i {} \;
 }
-find ${PKG}/usr/share/xfce4/panel-plugins -type f -name '*.desktop' -exec sed -e '/^Comment\[/d' -e '/^Name\[/d' -i {} \;
-find ${PKG}/usr/share/xfce4/panel-plugins -type f -name '*.desktop' -exec sed -e '/^Comment\[/d' -e '/^Name\[/d' -i {} \;
-find ${PKG}/usr/share/xfce4/panel-plugins -type f -name '*.desktop' -exec sed -r '/^(Comment|Name)\[/d' -i {} \;
diff --git a/xfce4-mount-plugin/Pkgfile b/xfce4-mount-plugin/Pkgfile
index 03e43f2..679fcfe 100644
--- a/xfce4-mount-plugin/Pkgfile
+++ b/xfce4-mount-plugin/Pkgfile
@@ -7,7 +7,7 @@
 
 name=xfce4-mount-plugin
 version=0.5.4
-release=1
+release=2
 source=(http://goodies.xfce.org/releases/${name}/${name}-${version}.tar.bz2)
 
 build() {
@@ -19,7 +19,6 @@ build() {
   make
   make DESTDIR=${PKG} install
   rm -rf ${PKG}/usr/share/locale
+  find ${PKG}/usr/share/xfce4/panel-plugins -type f -name '*.desktop' \
+    -exec sed -r '/^(Comment|Name)\[/d' -i {} \;
 }
-find ${PKG}/usr/share/xfce4/panel-plugins -type f -name '*.desktop' -exec sed -e '/^Comment\[/d' -e '/^Name\[/d' -i {} \;
-find ${PKG}/usr/share/xfce4/panel-plugins -type f -name '*.desktop' -exec sed -e '/^Comment\[/d' -e '/^Name\[/d' -i {} \;
-find ${PKG}/usr/share/xfce4/panel-plugins -type f -name '*.desktop' -exec sed -r '/^(Comment|Name)\[/d' -i {} \;
diff --git a/xfce4-notes-plugin/Pkgfile b/xfce4-notes-plugin/Pkgfile
index d5f2991..4058a01 100644
--- a/xfce4-notes-plugin/Pkgfile
+++ b/xfce4-notes-plugin/Pkgfile
@@ -7,7 +7,7 @@
 
 name=xfce4-notes-plugin
 version=1.6.0
-release=1
+release=2
 source=(http://goodies.xfce.org/releases/${name}/${name}-${version}.tar.bz2)
 
 build() {
@@ -19,7 +19,6 @@ build() {
   make
   make DESTDIR=${PKG} install
   rm -rf ${PKG}/usr/share/locale
+  find ${PKG}/usr/share/xfce4/panel-plugins -type f -name '*.desktop' \
+    -exec sed -r '/^(Comment|Name)\[/d' -i {} \;
 }
-find ${PKG}/usr/share/xfce4/panel-plugins -type f -name '*.desktop' -exec sed -e '/^Comment\[/d' -e '/^Name\[/d' -i {} \;
-find ${PKG}/usr/share/xfce4/panel-plugins -type f -name '*.desktop' -exec sed -e '/^Comment\[/d' -e '/^Name\[/d' -i {} \;
-find ${PKG}/usr/share/xfce4/panel-plugins -type f -name '*.desktop' -exec sed -r '/^(Comment|Name)\[/d' -i {} \;
diff --git a/xfce4-panel/Pkgfile b/xfce4-panel/Pkgfile
index db79a1a..0edfc37 100644
--- a/xfce4-panel/Pkgfile
+++ b/xfce4-panel/Pkgfile
@@ -1,12 +1,12 @@
 # Description: Panel for XFce4
-# URL:         http://www.xfce.org
-# Maintainer:  Jürgen Daubert, juergen dot daubert at t-online dot de
-# Depends on:  librsvg, xfce-mcs-manager
-# Group:       xfce4
+# URL: http://www.xfce.org
+# Maintainer: Jürgen Daubert, juergen dot daubert at t-online dot de
+# Depends on: librsvg, xfce-mcs-manager
+# Group: xfce4
 
 name=xfce4-panel
 version=4.4.2
-release=1
+release=2
 source=(http://www.xfce.org/archive/xfce-$version/src/$name-$version.tar.bz2)
 
 build () {
@@ -17,34 +17,6 @@ build () {
     make DESTDIR=$PKG install
     rm -rf $PKG/usr/share/locale
     rm -r $PKG/usr/share/gtk-doc
+    find ${PKG}/usr/share/xfce4/panel-plugins -type f -name '*.desktop' \
+      -exec sed -r '/^(Comment|Name)\[/d' -i {} \;
 }
-find ${PKG}/usr/share/xfce4/panel-plugins -type f -name '*.desktop' -exec sed -e '/^Comment\[/d' -e '/^Name\[/d' -i {} \;
-find ${PKG}/usr/share/xfce4/panel-plugins -type f -name '*.desktop' -exec sed -e '/^Comment\[/d' -e '/^Name\[/d' -i {} \;
-find ${PKG}/usr/share/xfce4/panel-plugins -type f -name '*.desktop' -exec sed -e '/^Comment\[/d' -e '/^Name\[/d' -i {} \;
-find ${PKG}/usr/share/xfce4/panel-plugins -type f -name '*.desktop' -exec sed -e '/^Comment\[/d' -e '/^Name\[/d' -i {} \;
-find ${PKG}/usr/share/xfce4/panel-plugins -type f -name '*.desktop' -exec sed -e '/^Comment\[/d' -e '/^Name\[/d' -i {} \;
-find ${PKG}/usr/share/xfce4/panel-plugins -type f -name '*.desktop' -exec sed -e '/^Comment\[/d' -e '/^Name\[/d' -i {} \;
-find ${PKG}/usr/share/xfce4/panel-plugins -type f -name '*.desktop' -exec sed -e '/^Comment\[/d' -e '/^Name\[/d' -i {} \;
-find ${PKG}/usr/share/xfce4/panel-plugins -type f -name '*.desktop' -exec sed -e '/^Comment\[/d' -e '/^Name\[/d' -i {} \;
-find ${PKG}/usr/share/xfce4/panel-plugins -type f -name '*.desktop' -exec sed -e '/^Comment\[/d' -e '/^Name\[/d' -i {} \;
-find ${PKG}/usr/share/xfce4/panel-plugins -type f -name '*.desktop' -exec sed -e '/^Comment\[/d' -e '/^Name\[/d' -i {} \;
-find ${PKG}/usr/share/xfce4/panel-plugins -type f -name '*.desktop' -exec sed -e '/^Comment\[/d' -e '/^Name\[/d' -i {} \;
-find ${PKG}/usr/share/xfce4/panel-plugins -type f -name '*.desktop' -exec sed -e '/^Comment\[/d' -e '/^Name\[/d' -i {} \;
-find ${PKG}/usr/share/xfce4/panel-plugins -type f -name '*.desktop' -exec sed -e '/^Comment\[/d' -e '/^Name\[/d' -i {} \;
-find ${PKG}/usr/share/xfce4/panel-plugins -type f -name '*.desktop' -exec sed -e '/^Comment\[/d' -e '/^Name\[/d' -i {} \;
-find ${PKG}/usr/share/xfce4/panel-plugins -type f -name '*.desktop' -exec sed -e '/^Comment\[/d' -e '/^Name\[/d' -i {} \;
-find ${PKG}/usr/share/xfce4/panel-plugins -type f -name '*.desktop' -exec sed -e '/^Comment\[/d' -e '/^Name\[/d' -i {} \;
-find ${PKG}/usr/share/xfce4/panel-plugins -type f -name '*.desktop' -exec sed -e '/^Comment\[/d' -e '/^Name\[/d' -i {} \;
-find ${PKG}/usr/share/xfce4/panel-plugins -type f -name '*.desktop' -exec sed -e '/^Comment\[/d' -e '/^Name\[/d' -i {} \;
-find ${PKG}/usr/share/xfce4/panel-plugins -type f -name '*.desktop' -exec sed -e '/^Comment\[/d' -e '/^Name\[/d' -i {} \;
-find ${PKG}/usr/share/xfce4/panel-plugins -type f -name '*.desktop' -exec sed -e '/^Comment\[/d' -e '/^Name\[/d' -i {} \;
-find ${PKG}/usr/share/xfce4/panel-plugins -type f -name '*.desktop' -exec sed -r '/^(Comment|Name)\[/d' -i {} \;
-find ${PKG}/usr/share/xfce4/panel-plugins -type f -name '*.desktop' -exec sed -r '/^(Comment|Name)\[/d' -i {} \;
-find ${PKG}/usr/share/xfce4/panel-plugins -type f -name '*.desktop' -exec sed -r '/^(Comment|Name)\[/d' -i {} \;
-find ${PKG}/usr/share/xfce4/panel-plugins -type f -name '*.desktop' -exec sed -r '/^(Comment|Name)\[/d' -i {} \;
-find ${PKG}/usr/share/xfce4/panel-plugins -type f -name '*.desktop' -exec sed -r '/^(Comment|Name)\[/d' -i {} \;
-find ${PKG}/usr/share/xfce4/panel-plugins -type f -name '*.desktop' -exec sed -r '/^(Comment|Name)\[/d' -i {} \;
-find ${PKG}/usr/share/xfce4/panel-plugins -type f -name '*.desktop' -exec sed -r '/^(Comment|Name)\[/d' -i {} \;
-find ${PKG}/usr/share/xfce4/panel-plugins -type f -name '*.desktop' -exec sed -r '/^(Comment|Name)\[/d' -i {} \;
-find ${PKG}/usr/share/xfce4/panel-plugins -type f -name '*.desktop' -exec sed -r '/^(Comment|Name)\[/d' -i {} \;
-find ${PKG}/usr/share/xfce4/panel-plugins -type f -name '*.desktop' -exec sed -r '/^(Comment|Name)\[/d' -i {} \;
diff --git a/xfce4-places-plugin/Pkgfile b/xfce4-places-plugin/Pkgfile
index 3a391fb..f19e8a3 100644
--- a/xfce4-places-plugin/Pkgfile
+++ b/xfce4-places-plugin/Pkgfile
@@ -7,7 +7,7 @@ en# Description: Plugin for quick access to folders, documents, and removable me
 
 name=xfce4-places-plugin
 version=1.0.0
-release=1
+release=2
 source=(http://goodies.xfce.org/releases/${name}/${name}-${version}.tar.bz2)
 
 build() {
@@ -19,7 +19,6 @@ build() {
   make
   make DESTDIR=${PKG} install
   rm -rf ${PKG}/usr/share/locale
+  find ${PKG}/usr/share/xfce4/panel-plugins -type f -name '*.desktop' \
+    -exec sed -r '/^(Comment|Name)\[/d' -i {} \;
 }
-find ${PKG}/usr/share/xfce4/panel-plugins -type f -name '*.desktop' -exec sed -e '/^Comment\[/d' -e '/^Name\[/d' -i {} \;
-find ${PKG}/usr/share/xfce4/panel-plugins -type f -name '*.desktop' -exec sed -e '/^Comment\[/d' -e '/^Name\[/d' -i {} \;
-find ${PKG}/usr/share/xfce4/panel-plugins -type f -name '*.desktop' -exec sed -r '/^(Comment|Name)\[/d' -i {} \;
diff --git a/xfce4-quicklauncher-plugin/Pkgfile b/xfce4-quicklauncher-plugin/Pkgfile
index 6c75a4f..a47792f 100644
--- a/xfce4-quicklauncher-plugin/Pkgfile
+++ b/xfce4-quicklauncher-plugin/Pkgfile
@@ -7,7 +7,7 @@
 
 name=xfce4-quicklauncher-plugin
 version=1.9.2
-release=1
+release=2
 source=(http://goodies.xfce.org/releases/${name}/${name}-${version}.tar.bz2)
 
 build() {
@@ -19,7 +19,6 @@ build() {
   make
   make DESTDIR=${PKG} install
   rm -rf ${PKG}/usr/share/locale
+  find ${PKG}/usr/share/xfce4/panel-plugins -type f -name '*.desktop' \
+    -exec sed -r '/^(Comment|Name)\[/d' -i {} \;
 }
-find ${PKG}/usr/share/xfce4/panel-plugins -type f -name '*.desktop' -exec sed -e '/^Comment\[/d' -e '/^Name\[/d' -i {} \;
-find ${PKG}/usr/share/xfce4/panel-plugins -type f -name '*.desktop' -exec sed -e '/^Comment\[/d' -e '/^Name\[/d' -i {} \;
-find ${PKG}/usr/share/xfce4/panel-plugins -type f -name '*.desktop' -exec sed -r '/^(Comment|Name)\[/d' -i {} \;
diff --git a/xfce4-smartbookmark-plugin/Pkgfile b/xfce4-smartbookmark-plugin/Pkgfile
index 5f6060d..cc71234 100644
--- a/xfce4-smartbookmark-plugin/Pkgfile
+++ b/xfce4-smartbookmark-plugin/Pkgfile
@@ -7,7 +7,7 @@
 
 name=xfce4-smartbookmark-plugin
 version=0.4.2
-release=1
+release=2
 source=(http://goodies.xfce.org/releases/${name}/${name}-${version}.tar.gz)
 
 build() {
@@ -19,7 +19,6 @@ build() {
   make
   make DESTDIR=${PKG} install
   rm -rf ${PKG}/usr/share/locale
+  find ${PKG}/usr/share/xfce4/panel-plugins -type f -name '*.desktop' \
+    -exec sed -r '/^(Comment|Name)\[/d' -i {} \;
 }
-find ${PKG}/usr/share/xfce4/panel-plugins -type f -name '*.desktop' -exec sed -e '/^Comment\[/d' -e '/^Name\[/d' -i {} \;
-find ${PKG}/usr/share/xfce4/panel-plugins -type f -name '*.desktop' -exec sed -e '/^Comment\[/d' -e '/^Name\[/d' -i {} \;
-find ${PKG}/usr/share/xfce4/panel-plugins -type f -name '*.desktop' -exec sed -r '/^(Comment|Name)\[/d' -i {} \;
diff --git a/xfce4-smartpm-plugin/Pkgfile b/xfce4-smartpm-plugin/Pkgfile
index e0a2b55..fc7b82f 100644
--- a/xfce4-smartpm-plugin/Pkgfile
+++ b/xfce4-smartpm-plugin/Pkgfile
@@ -7,7 +7,7 @@
 
 name=xfce4-smartpm-plugin
 version=0.2.2
-release=1
+release=2
 source=(http://goodies.xfce.org/releases/${name}/${name}-${version}.tar.gz)
 
 build() {
@@ -19,7 +19,6 @@ build() {
   make
   make DESTDIR=${PKG} install
   rm -rf ${PKG}/usr/share/locale
+  find ${PKG}/usr/share/xfce4/panel-plugins -type f -name '*.desktop' \
+    -exec sed -r '/^(Comment|Name)\[/d' -i {} \;
 }
-find ${PKG}/usr/share/xfce4/panel-plugins -type f -name '*.desktop' -exec sed -e '/^Comment\[/d' -e '/^Name\[/d' -i {} \;
-find ${PKG}/usr/share/xfce4/panel-plugins -type f -name '*.desktop' -exec sed -e '/^Comment\[/d' -e '/^Name\[/d' -i {} \;
-find ${PKG}/usr/share/xfce4/panel-plugins -type f -name '*.desktop' -exec sed -r '/^(Comment|Name)\[/d' -i {} \;
diff --git a/xfce4-systemload-plugin/Pkgfile b/xfce4-systemload-plugin/Pkgfile
index 5805c8d..aa6b5eb 100644
--- a/xfce4-systemload-plugin/Pkgfile
+++ b/xfce4-systemload-plugin/Pkgfile
@@ -7,7 +7,7 @@
 
 name=xfce4-systemload-plugin
 version=0.4.2
-release=1
+release=2
 source=(http://goodies.xfce.org/releases/${name}/${name}-${version}.tar.bz2)
 
 build() {
@@ -19,7 +19,6 @@ build() {
   make
   make DESTDIR=${PKG} install
   rm -rf ${PKG}/usr/share/locale
+  find ${PKG}/usr/share/xfce4/panel-plugins -type f -name '*.desktop' \
+    -exec sed -r '/^(Comment|Name)\[/d' -i {} \;
 }
-find ${PKG}/usr/share/xfce4/panel-plugins -type f -name '*.desktop' -exec sed -e '/^Comment\[/d' -e '/^Name\[/d' -i {} \;
-find ${PKG}/usr/share/xfce4/panel-plugins -type f -name '*.desktop' -exec sed -e '/^Comment\[/d' -e '/^Name\[/d' -i {} \;
-find ${PKG}/usr/share/xfce4/panel-plugins -type f -name '*.desktop' -exec sed -r '/^(Comment|Name)\[/d' -i {} \;
diff --git a/xfce4-timer-plugin/Pkgfile b/xfce4-timer-plugin/Pkgfile
index 47a2858..f9df2ba 100644
--- a/xfce4-timer-plugin/Pkgfile
+++ b/xfce4-timer-plugin/Pkgfile
@@ -7,7 +7,7 @@
 
 name=xfce4-timer-plugin
 version=0.5.1
-release=1
+release=2
 source=(http://goodies.xfce.org/releases/${name}/${name}-${version}.tar.bz2)
 
 build() {
@@ -19,7 +19,6 @@ build() {
   make
   make DESTDIR=${PKG} install
   rm -rf ${PKG}/usr/share/locale
+  find ${PKG}/usr/share/xfce4/panel-plugins -type f -name '*.desktop' \
+    -exec sed -r '/^(Comment|Name)\[/d' -i {} \;
 }
-find ${PKG}/usr/share/xfce4/panel-plugins -type f -name '*.desktop' -exec sed -e '/^Comment\[/d' -e '/^Name\[/d' -i {} \;
-find ${PKG}/usr/share/xfce4/panel-plugins -type f -name '*.desktop' -exec sed -e '/^Comment\[/d' -e '/^Name\[/d' -i {} \;
-find ${PKG}/usr/share/xfce4/panel-plugins -type f -name '*.desktop' -exec sed -r '/^(Comment|Name)\[/d' -i {} \;
diff --git a/xfce4-weather-plugin/Pkgfile b/xfce4-weather-plugin/Pkgfile
index 30e588d..cdca52c 100644
--- a/xfce4-weather-plugin/Pkgfile
+++ b/xfce4-weather-plugin/Pkgfile
@@ -7,7 +7,7 @@
 
 name=xfce4-weather-plugin
 version=0.6.1
-release=1
+release=2
 source=(http://goodies.xfce.org/releases/${name}/${name}-${version}.tar.bz2)
 
 build() {
@@ -19,7 +19,6 @@ build() {
   make
   make DESTDIR=${PKG} install
   rm -rf ${PKG}/usr/share/locale
+  find ${PKG}/usr/share/xfce4/panel-plugins -type f -name '*.desktop' \
+    -exec sed -r '/^(Comment|Name)\[/d' -i {} \;
 }
-find ${PKG}/usr/share/xfce4/panel-plugins -type f -name '*.desktop' -exec sed -e '/^Comment\[/d' -e '/^Name\[/d' -i {} \;
-find ${PKG}/usr/share/xfce4/panel-plugins -type f -name '*.desktop' -exec sed -e '/^Comment\[/d' -e '/^Name\[/d' -i {} \;
-find ${PKG}/usr/share/xfce4/panel-plugins -type f -name '*.desktop' -exec sed -r '/^(Comment|Name)\[/d' -i {} \;
diff --git a/xfce4-xkb-plugin/Pkgfile b/xfce4-xkb-plugin/Pkgfile
index 525a043..f81b1ef 100644
--- a/xfce4-xkb-plugin/Pkgfile
+++ b/xfce4-xkb-plugin/Pkgfile
@@ -7,7 +7,7 @@
 
 name=xfce4-xkb-plugin
 version=0.4.3
-release=1
+release=2
 source=(http://goodies.xfce.org/releases/${name}/${name}-${version}.tar.bz2)
 
 build() {
@@ -19,7 +19,6 @@ build() {
   make
   make DESTDIR=${PKG} install
   rm -rf ${PKG}/usr/share/locale
+  find ${PKG}/usr/share/xfce4/panel-plugins -type f -name '*.desktop' \
+    -exec sed -r '/^(Comment|Name)\[/d' -i {} \;
 }
-find ${PKG}/usr/share/xfce4/panel-plugins -type f -name '*.desktop' -exec sed -e '/^Comment\[/d' -e '/^Name\[/d' -i {} \;
-find ${PKG}/usr/share/xfce4/panel-plugins -type f -name '*.desktop' -exec sed -e '/^Comment\[/d' -e '/^Name\[/d' -i {} \;
-find ${PKG}/usr/share/xfce4/panel-plugins -type f -name '*.desktop' -exec sed -r '/^(Comment|Name)\[/d' -i {} \;
diff --git a/xfce4-xmms-plugin/Pkgfile b/xfce4-xmms-plugin/Pkgfile
index 5c6ad5b..eb4d792 100644
--- a/xfce4-xmms-plugin/Pkgfile
+++ b/xfce4-xmms-plugin/Pkgfile
@@ -7,7 +7,7 @@
 
 name=xfce4-xmms-plugin
 version=0.5.1
-release=1
+release=2
 source=(http://goodies.xfce.org/releases/${name}/${name}-${version}.tar.bz2)
 
 build() {
@@ -19,7 +19,6 @@ build() {
   make
   make DESTDIR=${PKG} install
   rm -rf ${PKG}/usr/share/locale
+  find ${PKG}/usr/share/xfce4/panel-plugins -type f -name '*.desktop' \
+    -exec sed -r '/^(Comment|Name)\[/d' -i {} \;
 }
-find ${PKG}/usr/share/xfce4/panel-plugins -type f -name '*.desktop' -exec sed -e '/^Comment\[/d' -e '/^Name\[/d' -i {} \;
-find ${PKG}/usr/share/xfce4/panel-plugins -type f -name '*.desktop' -exec sed -e '/^Comment\[/d' -e '/^Name\[/d' -i {} \;
-find ${PKG}/usr/share/xfce4/panel-plugins -type f -name '*.desktop' -exec sed -r '/^(Comment|Name)\[/d' -i {} \;
diff --git a/xfdesktop/Pkgfile b/xfdesktop/Pkgfile
index 07dd410..9d02139 100644
--- a/xfdesktop/Pkgfile
+++ b/xfdesktop/Pkgfile
@@ -6,7 +6,7 @@
 
 name=xfdesktop
 version=4.4.2
-release=1
+release=2
 source=(http://www.xfce.org/archive/xfce-$version/src/$name-$version.tar.bz2)
 
 build () {
@@ -21,7 +21,6 @@ build () {
     rm -rf $PKG/usr/share/locale
     rm -r $PKG/usr/share/xfce4/doc/??
     rm $PKG/usr/etc/xdg/xfce4/desktop/*.xml.*
+    find ${PKG}/usr/share/xfce4/panel-plugins -type f -name '*.desktop' \
+      -exec sed -r '/^(Comment|Name)\[/d' -i {} \;
 }
-find ${PKG}/usr/share/xfce4/panel-plugins -type f -name '*.desktop' -exec sed -e '/^Comment\[/d' -e '/^Name\[/d' -i {} \;
-find ${PKG}/usr/share/xfce4/panel-plugins -type f -name '*.desktop' -exec sed -e '/^Comment\[/d' -e '/^Name\[/d' -i {} \;
-find ${PKG}/usr/share/xfce4/panel-plugins -type f -name '*.desktop' -exec sed -r '/^(Comment|Name)\[/d' -i {} \;