pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

The package is now built. Needed more love for testing especially outside a NetBSD enviroment.

Module Name:	pkgsrc-wip
Committed By:	Daniel Oelschlegel <amoibos%gmail.com@localhost>
Pushed By:	amoibos
Date:		Sat Sep 3 17:26:15 2016 +0000
Changeset:	0c8d7ead0d5e8ba9765cf28b4408d192cb256f54

Modified Files:
	mosquitto/Makefile
	mosquitto/PLIST
	mosquitto/distinfo
	mosquitto/patches/patch-aa
	mosquitto/patches/patch-ab
	mosquitto/patches/patch-ac
	mosquitto/patches/patch-ad
	mosquitto/patches/patch-ae
	mosquitto/patches/patch-af
	mosquitto/patches/patch-ag
	mosquitto/patches/patch-ah
	mosquitto/patches/patch-ai
	mosquitto/patches/patch-aj
	mosquitto/patches/patch-ak
	mosquitto/patches/patch-al
	mosquitto/patches/patch-am
	mosquitto/patches/patch-an

Log Message:
The package is now built. Needed more love for testing especially outside a NetBSD enviroment.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=0c8d7ead0d5e8ba9765cf28b4408d192cb256f54

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 mosquitto/Makefile         |  4 ++++
 mosquitto/PLIST            |  8 ++++----
 mosquitto/distinfo         | 28 ++++++++++++++--------------
 mosquitto/patches/patch-aa |  2 +-
 mosquitto/patches/patch-ab |  2 +-
 mosquitto/patches/patch-ac |  2 +-
 mosquitto/patches/patch-ad | 11 +----------
 mosquitto/patches/patch-ae |  2 +-
 mosquitto/patches/patch-af |  2 +-
 mosquitto/patches/patch-ag |  2 +-
 mosquitto/patches/patch-ah |  2 +-
 mosquitto/patches/patch-ai |  2 +-
 mosquitto/patches/patch-aj |  2 +-
 mosquitto/patches/patch-ak |  2 ++
 mosquitto/patches/patch-al |  2 ++
 mosquitto/patches/patch-am |  2 ++
 mosquitto/patches/patch-an |  2 ++
 17 files changed, 40 insertions(+), 37 deletions(-)

diffs:
diff --git a/mosquitto/Makefile b/mosquitto/Makefile
index be2d2ad..5564db1 100644
--- a/mosquitto/Makefile
+++ b/mosquitto/Makefile
@@ -12,5 +12,9 @@ LICENSE=	eclipse-license
 USE_LANGUAGES+=	c c++
 USE_TOOLS+=	cmake gmake
 
+post-install:
+	mkdir ${DESTDIR}${PREFIX}/etc/mosquitto
+	${INSTALL}	${WRKSRC}/pskfile.example ${WRKSRC}/pwfile.example ${WRKSRC}/mosquitto.conf ${WRKSRC}/aclfile.example ${DESTDIR}${PREFIX}/etc/mosquitto
+
 .include "../../net/libcares/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mosquitto/PLIST b/mosquitto/PLIST
index f54ffa0..611934a 100644
--- a/mosquitto/PLIST
+++ b/mosquitto/PLIST
@@ -18,7 +18,7 @@ man/man7/mosquitto-tls.7
 man/man7/mqtt.7
 man/man8/mosquitto.8
 sbin/mosquitto
-share/examples/mosquitto/aclfile.example
-share/examples/mosquitto/mosquitto.conf
-share/examples/mosquitto/pskfile.example
-share/examples/mosquitto/pwfile.example
+etc/mosquitto/aclfile.example
+etc/mosquitto/mosquitto.conf
+etc/mosquitto/pskfile.example
+etc/mosquitto/pwfile.example
diff --git a/mosquitto/distinfo b/mosquitto/distinfo
index 9c5a88e..676b744 100644
--- a/mosquitto/distinfo
+++ b/mosquitto/distinfo
@@ -4,17 +4,17 @@ SHA1 (mosquitto-1.4.10.tar.gz) = f09641cd34eddb6747bc3e7ffee64d2a7cfd6183
 RMD160 (mosquitto-1.4.10.tar.gz) = 4d3c8eb45f3635044aea352fb0a42c709d004cb5
 SHA512 (mosquitto-1.4.10.tar.gz) = fe5d6d7196a137a496ba6881c77d852396baefb4f0b83ccd9a22175fc05b09e48a09ea249e30ec7db966e11de134ebcc4e2e9b1fd40b31dc59fb0fa2f60b75a1
 Size (mosquitto-1.4.10.tar.gz) = 359569 bytes
-SHA1 (patch-aa) = 9da33768dd0c5c4aa4277153ed5b3d8c5c3f2070
-SHA1 (patch-ab) = 8bf4c0d2a8dd1baaa6fffabba75c75f2fc604daf
-SHA1 (patch-ac) = 0a9dc86ff84ea0d8cadce12c77c6dd2e7bf010f1
-SHA1 (patch-ad) = 29a1593ad6625ef4615ffc18f7812a2d0d1e4cad
-SHA1 (patch-ae) = d915e26afcba074c6b6d31e73b6cb5001e2ede39
-SHA1 (patch-af) = 4f797b6339f2a7f91466c78bf6fb33c9101b20e3
-SHA1 (patch-ag) = 45b7e547857458c69805b517dda799cf483ae822
-SHA1 (patch-ah) = dd1c2930269531c9f63e101a13b8471758f25784
-SHA1 (patch-ai) = 1251819d0ccc96b7b307023365a7edbc11906ddf
-SHA1 (patch-aj) = 6ea887e67976e0a6907a06220bb9d730f2e7c6a1
-SHA1 (patch-ak) = 9f453c4ec807dfa37d42b154b001cec057c27013
-SHA1 (patch-al) = 90d41a4716424f5814ed3cfcf2aab8ad96a6f513
-SHA1 (patch-am) = cdae5843c35c32df017b9396a35909542210d76b
-SHA1 (patch-an) = b98cc3ae73a62845da3f4f534b968341f142d621
+SHA1 (patch-aa) = 9bf1ff1a55a27192e5f528fbf5d376b47841b831
+SHA1 (patch-ab) = d8af18c34f230624fe4bb5c2acb31f62917eca63
+SHA1 (patch-ac) = 9ff1dd59ed5dbf499c82a8144d86e5d6cc6cd2e9
+SHA1 (patch-ad) = 722c3b11f8ff75d2ce6dc987dc31982f9d53ba81
+SHA1 (patch-ae) = a370b6e7de6bdcb62cbac86211963be45b4601a3
+SHA1 (patch-af) = 90561fcebe1bc2212e834d7cb12608d226246977
+SHA1 (patch-ag) = dd645cca8be0ca63b34737e35a1dcc3c29bd55f7
+SHA1 (patch-ah) = 87a54f8a1b75986352dc27ad720202281c017a57
+SHA1 (patch-ai) = c15ccca3b0bcdee389324f6e2090a371fb7be74d
+SHA1 (patch-aj) = d592d5442e2b3364bd6cf7cec25d8bf41bf6027d
+SHA1 (patch-ak) = 85e65fa30dac09bcb9b8150fe98d967ba0cf25e4
+SHA1 (patch-al) = 4baa9d647953eec6149c95ba871aaec562206c69
+SHA1 (patch-am) = 67b1cbf3514d37e3f9b0253c65f5ad21cfc201de
+SHA1 (patch-an) = 28f82706cc0e8cc211f62ac316d0c354b4f0bc0d
diff --git a/mosquitto/patches/patch-aa b/mosquitto/patches/patch-aa
index 97b2feb..fe8c5ba 100644
--- a/mosquitto/patches/patch-aa
+++ b/mosquitto/patches/patch-aa
@@ -1,5 +1,5 @@
 $NetBSD$
-
+Copying from OpenBSD 
 --- CMakeLists.txt.orig	2016-06-02 21:20:22.000000000 +0000
 +++ CMakeLists.txt	2016-08-28 15:50:53.430205374 +0000
 @@ -37,18 +40,12 @@
diff --git a/mosquitto/patches/patch-ab b/mosquitto/patches/patch-ab
index 23f7502..e01d5ad 100644
--- a/mosquitto/patches/patch-ab
+++ b/mosquitto/patches/patch-ab
@@ -1,5 +1,5 @@
 $NetBSD$
-
+Supports NetBSD detection, opened upstream pull request 
 --- lib/CMakeLists.txt.orig	2016-06-02 21:20:22.000000000 +0000
 +++ lib/CMakeLists.txt	2016-08-28 14:00:33.700421980 +0000
 @@ -43,9 +43,9 @@
diff --git a/mosquitto/patches/patch-ac b/mosquitto/patches/patch-ac
index c562501..9855c8a 100644
--- a/mosquitto/patches/patch-ac
+++ b/mosquitto/patches/patch-ac
@@ -1,5 +1,5 @@
 $NetBSD$
-
+Taken from OpenBSD
 --- lib/cpp/CMakeLists.txt.orig	2016-06-02 21:20:22.000000000 +0000
 +++ lib/cpp/CMakeLists.txt	2016-08-28 14:01:52.611842007 +0000
 @@ -13,6 +13,3 @@
diff --git a/mosquitto/patches/patch-ad b/mosquitto/patches/patch-ad
index 21126c3..f592e95 100644
--- a/mosquitto/patches/patch-ad
+++ b/mosquitto/patches/patch-ad
@@ -1,5 +1,5 @@
 $NetBSD$
-
+Better defaults for configuration, inspired by FreeBSD
 --- mosquitto.conf.orig	2016-06-02 21:20:22.000000000 +0000
 +++ mosquitto.conf	2016-08-28 15:28:28.495612360 +0000
 @@ -32,7 +32,7 @@
@@ -11,15 +11,6 @@ $NetBSD$
  
  # When run as root, drop privileges to this user and its primary 
  # group.
-@@ -40,7 +40,7 @@
- # If run as a non-root user, this setting has no effect.
- # Note that on Windows this has no effect and so mosquitto should 
- # be started by the user you wish it to run as.
--#user mosquitto
-+user mosquitto
- 
- # The maximum number of QoS 1 and 2 messages currently inflight per 
- # client.
 @@ -133,7 +133,7 @@
  #bind_address
  
diff --git a/mosquitto/patches/patch-ae b/mosquitto/patches/patch-ae
index 8dbe440..73cbed7 100644
--- a/mosquitto/patches/patch-ae
+++ b/mosquitto/patches/patch-ae
@@ -1,5 +1,5 @@
 $NetBSD$
-
+Supports configuration for NetBSD, taken from OpenBSD
 --- src/CMakeLists.txt.orig	2016-06-02 21:20:22.000000000 +0000
 +++ src/CMakeLists.txt	2016-08-28 14:13:03.999103447 +0000
 @@ -85,6 +85,8 @@
diff --git a/mosquitto/patches/patch-af b/mosquitto/patches/patch-af
index 694c832..0388c6b 100644
--- a/mosquitto/patches/patch-af
+++ b/mosquitto/patches/patch-af
@@ -1,5 +1,5 @@
 $NetBSD$
-
+Missing NetBSD detection, opened upstream pull request
 --- lib/memory_mosq.h.orig	2016-06-02 21:20:22.000000000 +0000
 +++ lib/memory_mosq.h	2016-08-28 14:30:34.000000000 +0000
 @@ -20,7 +20,7 @@
diff --git a/mosquitto/patches/patch-ag b/mosquitto/patches/patch-ag
index 5a38032..5b5e8f0 100644
--- a/mosquitto/patches/patch-ag
+++ b/mosquitto/patches/patch-ag
@@ -1,5 +1,5 @@
 $NetBSD$
-
+Taken from OpenBSD, maybe useful for others
 --- lib/tls_mosq.c.orig	2016-06-02 21:20:22.000000000 +0000
 +++ lib/tls_mosq.c	2016-08-28 14:31:56.000000000 +0000
 @@ -20,6 +20,7 @@
diff --git a/mosquitto/patches/patch-ah b/mosquitto/patches/patch-ah
index 8e5bb7e..76870f6 100644
--- a/mosquitto/patches/patch-ah
+++ b/mosquitto/patches/patch-ah
@@ -1,5 +1,5 @@
 $NetBSD$
-
+Support exception for NetBSD, taken from FreeBSD
 --- config.mk.orig	2016-06-02 21:20:22.000000000 +0000
 +++ config.mk	2016-08-28 15:27:03.968104814 +0000
 @@ -115,7 +115,7 @@
diff --git a/mosquitto/patches/patch-ai b/mosquitto/patches/patch-ai
index 6a32a9c..890ee19 100644
--- a/mosquitto/patches/patch-ai
+++ b/mosquitto/patches/patch-ai
@@ -1,5 +1,5 @@
 $NetBSD$
-
+Missing NetBSD detection, opened upstream pull request
 --- src/net.c.orig	2016-06-02 21:20:22.000000000 +0000
 +++ src/net.c	2016-08-28 15:15:07.413097823 +0000
 @@ -35,7 +35,7 @@
diff --git a/mosquitto/patches/patch-aj b/mosquitto/patches/patch-aj
index 1b0b91f..e67530c 100644
--- a/mosquitto/patches/patch-aj
+++ b/mosquitto/patches/patch-aj
@@ -1,5 +1,5 @@
 $NetBSD$
-
+Missing NetBSD detection, opened upstream pull request
 --- lib/net_mosq.c.orig	2016-06-02 21:20:22.000000000 +0000
 +++ lib/net_mosq.c	2016-08-28 15:15:43.540861477 +0000
 @@ -34,7 +34,7 @@
diff --git a/mosquitto/patches/patch-ak b/mosquitto/patches/patch-ak
index 9f44913..9de98fe 100644
--- a/mosquitto/patches/patch-ak
+++ b/mosquitto/patches/patch-ak
@@ -1,3 +1,5 @@
+$NetBSD$
+BSDs don't support long options
 --- lib/Makefile.orig	2016-08-29 21:51:21.897719218 +0000
 +++ lib/Makefile	2016-08-29 21:51:43.349422011 +0000
 @@ -25,7 +25,7 @@
diff --git a/mosquitto/patches/patch-al b/mosquitto/patches/patch-al
index 6a5df4e..84c56b7 100644
--- a/mosquitto/patches/patch-al
+++ b/mosquitto/patches/patch-al
@@ -1,3 +1,5 @@
+$NetBSD$
+BSDs don't support long options
 --- src/Makefile.orig	2016-08-29 21:52:55.923491416 +0000
 +++ src/Makefile	2016-08-29 21:53:27.614743795 +0000
 @@ -103,12 +103,12 @@
diff --git a/mosquitto/patches/patch-am b/mosquitto/patches/patch-am
index 4938530..6afb29f 100644
--- a/mosquitto/patches/patch-am
+++ b/mosquitto/patches/patch-am
@@ -1,3 +1,5 @@
+$NetBSD$
+BSDs don't support long options
 --- lib/cpp/Makefile.orig	2016-08-29 21:50:11.282837830 +0000
 +++ lib/cpp/Makefile	2016-08-29 21:50:41.337564781 +0000
 @@ -10,7 +10,7 @@
diff --git a/mosquitto/patches/patch-an b/mosquitto/patches/patch-an
index 8684ae8..71d5ddf 100644
--- a/mosquitto/patches/patch-an
+++ b/mosquitto/patches/patch-an
@@ -1,3 +1,5 @@
+$NetBSD$
+BSDs don't support long options
 --- client/Makefile.orig	2016-08-29 21:52:12.870263205 +0000
 +++ client/Makefile	2016-08-29 21:52:39.329840759 +0000
 @@ -24,8 +24,8 @@
Home | Main Index | Thread Index | Old Index