From 3de2ae3dbc1389aa8ec71843924349bfb9a66a5c Mon Sep 17 00:00:00 2001
From: Nicolás Reynolds <fauno@parabola.nu>
Date: Mon, 3 Jun 2013 12:34:10 -0300
Subject: Patch for /usr/bin merge

---
 pcr/mosquitto/PKGBUILD          | 15 ++++++++++-----
 pcr/mosquitto/binmerge.patch    | 21 +++++++++++++++++++++
 pcr/mosquitto/mosquitto.service |  6 +++---
 3 files changed, 34 insertions(+), 8 deletions(-)
 create mode 100644 pcr/mosquitto/binmerge.patch

(limited to 'pcr/mosquitto')

diff --git a/pcr/mosquitto/PKGBUILD b/pcr/mosquitto/PKGBUILD
index 652e75691..2f765ad13 100644
--- a/pcr/mosquitto/PKGBUILD
+++ b/pcr/mosquitto/PKGBUILD
@@ -4,22 +4,27 @@
 
 pkgname=mosquitto
 pkgver=1.1.3
-pkgrel=2
+pkgrel=3
 pkgdesc="An Open Source MQTT v3.1 Broker"
 arch=('i686' 'x86_64' 'arm' 'armv6h' 'mips64el')
 url="http://mosquitto.org/"
 makedepends=('python')
 optdepends=('python: python support')
 license=('BSD')
-source=(http://mosquitto.org/files/source/$pkgname-$pkgver.tar.gz{,.asc} "$pkgname.service" )
+source=(http://mosquitto.org/files/source/$pkgname-$pkgver.tar.gz{,.asc} "$pkgname.service" 
+        "binmerge.patch")
 md5sums=('fd0cae17221d778b0a002c31e6c3de9e'
          'SKIP'
-         'b7cdd7a65d9a7ac5a8c2456f4b1f2d8f')
+         '58af79ed48be928f91e5435cda82bb8b'
+         '27e24b672d63b797f0e026ab85c64c4b')
+
+prepare() {
+  cd "$srcdir/$pkgname-$pkgver/src"
+  patch -N -i ${srcdir}/binmerge.patch
+}
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
-  #Remove hardcoded prefix
-  find -name Makefile -exec sed '/prefix=/d' -i {} \;
 
   make prefix=/usr
 }
diff --git a/pcr/mosquitto/binmerge.patch b/pcr/mosquitto/binmerge.patch
new file mode 100644
index 000000000..d6d79041d
--- /dev/null
+++ b/pcr/mosquitto/binmerge.patch
@@ -0,0 +1,21 @@
+--- src/Makefile.orig	2013-06-03 12:23:15.288586121 -0300
++++ src/Makefile	2013-06-03 12:23:29.455571403 -0300
+@@ -90,15 +90,15 @@
+ 	${CC} $(CFLAGS) ${CPPFLAGS} -c $< -o $@
+ 
+ install : all
+-	$(INSTALL) -d ${DESTDIR}$(prefix)/sbin
+-	$(INSTALL) -s mosquitto ${DESTDIR}${prefix}/sbin/mosquitto
++	$(INSTALL) -d ${DESTDIR}$(prefix)/bin
++	$(INSTALL) -s mosquitto ${DESTDIR}${prefix}/bin/mosquitto
+ 	$(INSTALL) mosquitto_plugin.h ${DESTDIR}${prefix}/include/mosquitto_plugin.h
+ ifeq ($(WITH_TLS),yes)
+ 	$(INSTALL) -s mosquitto_passwd ${DESTDIR}${prefix}/bin/mosquitto_passwd
+ endif
+ 
+ uninstall :
+-	-rm -f ${DESTDIR}${prefix}/sbin/mosquitto
++	-rm -f ${DESTDIR}${prefix}/bin/mosquitto
+ 	-rm -f ${DESTDIR}${prefix}/include/mosquitto_plugin.h
+ 	-rm -f ${DESTDIR}${prefix}/bin/mosquitto_passwd
+ 
diff --git a/pcr/mosquitto/mosquitto.service b/pcr/mosquitto/mosquitto.service
index 7e9ef7cc8..9626cbc45 100644
--- a/pcr/mosquitto/mosquitto.service
+++ b/pcr/mosquitto/mosquitto.service
@@ -12,9 +12,9 @@ Requires=network.target
 
 [Service]
 Type=forking
-ExecStart=/usr/sbin/mosquitto -c /etc/mosquitto/mosquitto.conf -d
-ExecStartPre=/bin/rm -f /var/run/mosquitto.pid
-PIDFile=/var/run/mosquitto.pid
+ExecStart=/usr/bin/mosquitto -c /etc/mosquitto/mosquitto.conf -d
+ExecStartPre=/usr/bin/rm -f /run/mosquitto.pid
+PIDFile=/run/mosquitto.pid
 Restart=on-abort
 
 [Install]
-- 
cgit v1.2.3