Update to 0.4_beta4

4 files changed, 56 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1db54a445ded..6cc7f5ff066e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = brightd
 	pkgdesc = Automatically dims screen when there is no user input (like a macbook :-).
-	pkgver = 0.4.1
+	pkgver = 0.4_beta4
 	pkgrel = 5
 	url = http://www.pberndt.com/Programme/Linux/brightd/
 	install = brightd.install
@@ -8,13 +8,14 @@ pkgbase = brightd
 	arch = x86_64
 	license = GPL2
 	depends = libxss
-	source = http://www.pberndt.com/raw/Programme/Linux/brightd/_download/brightd-0.4.1.tar.bz2
+	source = http://www.pberndt.com/raw/Programme/Linux/brightd/_download/brightd-0.4_beta4.tar.bz2
 	source = brightd.service
 	source = proposal.patch
-	md5sums = 42f1572c51162bf583d6436c3b36cc17
+	source = makefile.patch
+	md5sums = 31e455ea3f06da55a4c4d89da2bb6e2e
 	md5sums = f5d5c7ed5c48d2dbe408986d5f6249fb
-	md5sums = a4717b49eb0494de57d19a3a574462ec
-	md5sums = 549926dcb3c43e0e6fe45025806d0782
+	md5sums = 1fead7c648d3939970e7e62b21146734
+	md5sums = 0875c269556e2cee2151a5dc95fe14e3
 
 pkgname = brightd
 
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..62d30f9218cb
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+src/
+pkg/
diff --git a/PKGBUILD b/PKGBUILD
index b287ba86847e..e03c99ab7dbf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,42 +1,46 @@
+# Maintainer:  Marcin (CTRL) Wieczorek <marcin@marcin.co>
 # Contributor: csllbr
 # Contributor: Cheer Xiao <xiaqqaix AT gmail DOT com>
 # Contributor: Leo Scherer <aur AT leo-scherer DOT de>
-# original Contributor: Niklas Schmuecker (IRC: nisc) <nschmuecker (gmail)>
+# Contributor: Niklas Schmuecker (IRC: nisc) <nschmuecker (gmail)>
 
 pkgname=brightd
-pkgver=0.4.1
+pkgver=0.4_beta4
 pkgrel=5
 pkgdesc='Automatically dims screen when there is no user input (like a macbook :-).'
 arch=('i686' 'x86_64')
 license=('GPL2')
 url='http://www.pberndt.com/Programme/Linux/brightd/'
 depends=('libxss')
-install='brightd.install'
-source=("http://www.pberndt.com/raw/Programme/Linux/brightd/_download/$pkgname-$pkgver.tar.bz2" 'brightd.service' 'proposal.patch')
+install="${pkgname}.install"
+source=("http://www.pberndt.com/raw/Programme/Linux/brightd/_download/$pkgname-$pkgver.tar.bz2"
+        'brightd.service'
+        'proposal.patch'
+        'makefile.patch')
 
-md5sums=('42f1572c51162bf583d6436c3b36cc17'
+md5sums=('31e455ea3f06da55a4c4d89da2bb6e2e'
          'f5d5c7ed5c48d2dbe408986d5f6249fb'
-         'a4717b49eb0494de57d19a3a574462ec'
-         '549926dcb3c43e0e6fe45025806d0782')
+         '1fead7c648d3939970e7e62b21146734'
+         '0875c269556e2cee2151a5dc95fe14e3')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+    cd "${srcdir}/$pkgname-$pkgver"
 
-  # fixes AC-detection by moving to /sys, blocks intel_backlight
-  # and makes fade smoother
-  patch -p1 -i $startdir/proposal.patch
-  make
+    # fixes AC-detection by moving to /sys, blocks intel_backlight
+    # and makes fade smoother
+    patch -p1 -i ${srcdir}/proposal.patch
+
+    # fixes install process
+    patch -p1 -i ${srcdir}/makefile.patch
+
+    make
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-  install -Dsm755 "$srcdir/$pkgname-$pkgver/brightd" \
-                  "$pkgdir/usr/bin/brightd"
-  install -Dm644 "$srcdir/$pkgname-$pkgver/brightd.1" \
-                 "$pkgdir/usr/share/man/man1/brightd.1"
-  install -Dm644 "$srcdir/$pkgname-$pkgver/README" \
-                 "$pkgdir/usr/share/doc/brightd/README"
-  install -Dm644 "$srcdir/brightd.service" \
-                 "$pkgdir/usr/lib/systemd/system/brightd.service"
+    make DESTDIR=${pkgdir} install
+    install -Dsm755 "${srcdir}/$pkgname-$pkgver/brightd"   "${pkgdir}/usr/bin/brightd"
+    install -Dm644  "${srcdir}/$pkgname-$pkgver/brightd.1" "${pkgdir}/usr/share/man/man1/brightd.1"
+    install -Dm644  "${srcdir}/$pkgname-$pkgver/README"    "${pkgdir}/usr/share/doc/brightd/README"
+    install -Dm644  "${srcdir}/$pkgname-$pkgver/gpl.txt"    "${pkgdir}/usr/share/licenses/brightd/LICENSE"
+    install -Dm644  "${srcdir}/brightd.service"            "${pkgdir}/usr/lib/systemd/system/brightd.service"
 }
diff --git a/makefile.patch b/makefile.patch
new file mode 100644
index 000000000000..0384174e504c
--- /dev/null
+++ b/makefile.patch
@@ -0,0 +1,22 @@
+--- a/Makefile	2007-07-21 16:37:07.000000000 +0200
++++ b/Makefile	2016-05-14 14:01:46.913853159 +0200
+@@ -1,15 +1,13 @@
+-PREFIX=/
+-
+ brightd: brightd.c
+ 	gcc $(CFLAGS) -g -Wall -lX11 -lXss -o $@ $@.c
+ 
+ install: brightd
+-	install -Ds brightd $(PREFIX)/usr/bin/brightd
+-	install -D brightd.1 $(PREFIX)/usr/share/man/man1/brightd.1
++	install -Ds brightd $(DESTDIR)/usr/bin/brightd
++	install -D brightd.1 $(DESTDIR)/usr/share/man/man1/brightd.1
+ 
+ uninstall:
+-	rm $(PREFIX)/usr/bin/brightd
+-	rm $(PREFIX)/usr/share/man/man1/brightd.1
++	rm $(DESTDIR)/usr/bin/brightd
++	rm $(DESTDIR)/usr/share/man/man1/brightd.1
+ 
+ clean:
+ 	rm -f brightd