Attachment #154306 for bug #198587

View | Details | Raw Unified | Return to bug 198587
Collapse All | Expand All

Lines 2-8 Link Here

(-)/root/ejabberd/Makefile (-1 / +1 lines)
2	# $FreeBSD: head/net-im/ejabberd/Makefile 379092 2015-02-16 13:55:49Z ashish $	2	# $FreeBSD: head/net-im/ejabberd/Makefile 379092 2015-02-16 13:55:49Z ashish $
3		3
4	PORTNAME= ejabberd	4	PORTNAME= ejabberd
5	PORTVERSION= 14.12	5	PORTVERSION= 15.02
6	CATEGORIES= net-im	6	CATEGORIES= net-im
7	MASTER_SITES= http://www.process-one.net/downloads/${PORTNAME}/${PORTVERSION}/:p1 \	7	MASTER_SITES= http://www.process-one.net/downloads/${PORTNAME}/${PORTVERSION}/:p1 \
8	http://distfiles.pirateparty.in/%SUBDIR%/:deps \	8	http://distfiles.pirateparty.in/%SUBDIR%/:deps \

Lines 1-4 Link Here

(-)/root/ejabberd/distinfo (-2 / +2 lines)
1	SHA256 (ejabberd-14.12.tgz) = 88c481e6e81e6e81100cdfae8e77bc6ffd6faed62f1938cf1e90ed7504c8785a	1	SHA256 (ejabberd-15.02.tgz) = 58cc6b9b512f2f495993be735a8313a8a0591157e0f35a9a3702b59ff9eb6beb
2	SIZE (ejabberd-14.12.tgz) = 3261685	2	SIZE (ejabberd-15.02.tgz) = 3281316
3	SHA256 (ejabberd-deps-2.tar.xz) = 0f5604c0ce40c499f082170b457c4238fac570df71b4b03b9d5fa525abb15847	3	SHA256 (ejabberd-deps-2.tar.xz) = 0f5604c0ce40c499f082170b457c4238fac570df71b4b03b9d5fa525abb15847
4	SIZE (ejabberd-deps-2.tar.xz) = 12475132	4	SIZE (ejabberd-deps-2.tar.xz) = 12475132




--- Makefile.in.orig	2015-02-12 00:14:57.000000000 +0100
+++ Makefile.in	2015-03-14 23:50:41.000000000 +0100
@@ -18,7 +18,7 @@
--- Makefile.in.orig
+++ Makefile.in
@@ -15,7 +15,7 @@
 SBINDIR = $(DESTDIR)@sbindir@
 
 # /lib/ejabberd/

 
 # /share/doc/ejabberd
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -44,10 +44,10 @@
 MSGSDIR = $(PRIVDIR)/msgs
 
 # /var/lib/ejabberd/

 
 # /var/lib/ejabberd/.erlang.cookie
 COOKIEFILE = $(SPOOLDIR)/.erlang.cookie
@@ -116,9 +116,7 @@
 	#
 	# Configuration files
 	$(INSTALL) -d -m 750 $(G_USER) $(ETCDIR)

+	$(INSTALL) -m 640 $(G_USER) ejabberd.yml.example $(ETCDIR)
 	$(SED) -e "s*{{rootdir}}*@prefix@*" \
 		-e "s*{{installuser}}*@INSTALLUSER@*" \
 		-e "s*{{bindir}}*@bindir@*" \
@@ -126,16 +124,15 @@
 		-e "s*{{sysconfdir}}*@sysconfdir@*" \
 		-e "s*{{localstatedir}}*@localstatedir@*" \
 		-e "s*{{docdir}}*@docdir@*" \

-		|| $(INSTALL) -b -m 640 $(G_USER) ejabberdctl.cfg.example $(ETCDIR)/ejabberdctl.cfg
-	$(INSTALL) -b -m 644 $(G_USER) inetrc $(ETCDIR)/inetrc
+		-e "s*{{erl}}*@ERL@*" \
+		-e "s*lib/erlang/lib/ejabberd*lib/erlang/lib/ejabberd-$(PORTVERSION)*" \
+		ejabberdctl.template > ejabberdctl.example
+	$(INSTALL) -m 640 $(G_USER) ejabberdctl.cfg.example $(ETCDIR)
+	$(INSTALL) -b -m 644 $(G_USER) inetrc $(ETCDIR)/inetrc.example

 	[ -d $(SBINDIR) ] || $(INSTALL) -d -m 755 $(SBINDIR)
-	$(INSTALL) -m 550 $(G_USER) ejabberdctl.example $(SBINDIR)/ejabberdctl
+	$(INSTALL) -m 555 $(G_USER) ejabberdctl.example $(SBINDIR)/ejabberdctl
 	# Elixir binaries
 	[ -d $(BINDIR) ] || $(INSTALL) -d -m 755 $(BINDIR)
 	-[ -f deps/elixir/bin/iex ] && $(INSTALL) -m 550 $(G_USER) deps/elixir/bin/iex $(BINDIR)/iex
@@ -196,6 +193,7 @@
 	chmod -R 750 $(LOGDIR)
 	#
 	# Documentation

 	$(INSTALL) -d $(DOCDIR)
 	[ -f doc/dev.html ] \
 		&& $(INSTALL) -m 644 doc/dev.html $(DOCDIR) \
@@ -208,6 +206,7 @@
 		|| echo "No doc/guide.pdf was built"
 	$(INSTALL) -m 644 doc/*.png $(DOCDIR)
 	$(INSTALL) -m 644 COPYING $(DOCDIR)

Return to bug 198587

Lines 1-9 Link Here

(-)/root/ejabberd/files/patch-Makefile.in (-15 / +13 lines)
1		1	--- Makefile.in.orig 2015-02-12 00:14:57.000000000 +0100
2	$FreeBSD$	2	+++ Makefile.in 2015-03-14 23:50:41.000000000 +0100
3		3	@@ -18,7 +18,7 @@
4	--- Makefile.in.orig
5	+++ Makefile.in
6	@@ -15,7 +15,7 @@
7	SBINDIR = $(DESTDIR)@sbindir@	4	SBINDIR = $(DESTDIR)@sbindir@
8		5
9	# /lib/ejabberd/	6	# /lib/ejabberd/
Lines 12-18 Link Here
12		9
13	# /share/doc/ejabberd	10	# /share/doc/ejabberd
14	PACKAGE_TARNAME = @PACKAGE_TARNAME@	11	PACKAGE_TARNAME = @PACKAGE_TARNAME@
15	@@ -41,10 +41,10 @@	12	@@ -44,10 +44,10 @@
16	MSGSDIR = $(PRIVDIR)/msgs	13	MSGSDIR = $(PRIVDIR)/msgs
17		14
18	# /var/lib/ejabberd/	15	# /var/lib/ejabberd/
Lines 26-32 Link Here
26		23
27	# /var/lib/ejabberd/.erlang.cookie	24	# /var/lib/ejabberd/.erlang.cookie
28	COOKIEFILE = $(SPOOLDIR)/.erlang.cookie	25	COOKIEFILE = $(SPOOLDIR)/.erlang.cookie
29	@@ -113,25 +113,22 @@	26	@@ -116,9 +116,7 @@
30	#	27	#
31	# Configuration files	28	# Configuration files
32	$(INSTALL) -d -m 750 $(G_USER) $(ETCDIR)	29	$(INSTALL) -d -m 750 $(G_USER) $(ETCDIR)
Lines 36-42 Link Here
36	+ $(INSTALL) -m 640 $(G_USER) ejabberd.yml.example $(ETCDIR)	33	+ $(INSTALL) -m 640 $(G_USER) ejabberd.yml.example $(ETCDIR)
37	$(SED) -e "s{{rootdir}}@prefix@*" \	34	$(SED) -e "s{{rootdir}}@prefix@*" \
38	-e "s{{installuser}}@INSTALLUSER@*" \	35	-e "s{{installuser}}@INSTALLUSER@*" \
39	-e "s{{libdir}}@libdir@*" \	36	-e "s{{bindir}}@bindir@*" \
		37	@@ -126,16 +124,15 @@
40	-e "s{{sysconfdir}}@sysconfdir@*" \	38	-e "s{{sysconfdir}}@sysconfdir@*" \
41	-e "s{{localstatedir}}@localstatedir@*" \	39	-e "s{{localstatedir}}@localstatedir@*" \
42	-e "s{{docdir}}@docdir@*" \	40	-e "s{{docdir}}@docdir@*" \
Lines 47-53 Link Here
47	- \|\| $(INSTALL) -b -m 640 $(G_USER) ejabberdctl.cfg.example $(ETCDIR)/ejabberdctl.cfg	45	- \|\| $(INSTALL) -b -m 640 $(G_USER) ejabberdctl.cfg.example $(ETCDIR)/ejabberdctl.cfg
48	- $(INSTALL) -b -m 644 $(G_USER) inetrc $(ETCDIR)/inetrc	46	- $(INSTALL) -b -m 644 $(G_USER) inetrc $(ETCDIR)/inetrc
49	+ -e "s{{erl}}@ERL@*" \	47	+ -e "s{{erl}}@ERL@*" \
50	+ -e "slib/erlang/lib/ejabberdlib/erlang/lib/ejabberd-$(PORTVERSION)*" \	48	+ -e "slib/erlang/lib/ejabberdlib/erlang/lib/ejabberd-$(PORTVERSION)*" \
51	+ ejabberdctl.template > ejabberdctl.example	49	+ ejabberdctl.template > ejabberdctl.example
52	+ $(INSTALL) -m 640 $(G_USER) ejabberdctl.cfg.example $(ETCDIR)	50	+ $(INSTALL) -m 640 $(G_USER) ejabberdctl.cfg.example $(ETCDIR)
53	+ $(INSTALL) -b -m 644 $(G_USER) inetrc $(ETCDIR)/inetrc.example	51	+ $(INSTALL) -b -m 644 $(G_USER) inetrc $(ETCDIR)/inetrc.example
Lines 56-65 Link Here
56	[ -d $(SBINDIR) ] \|\| $(INSTALL) -d -m 755 $(SBINDIR)	54	[ -d $(SBINDIR) ] \|\| $(INSTALL) -d -m 755 $(SBINDIR)
57	- $(INSTALL) -m 550 $(G_USER) ejabberdctl.example $(SBINDIR)/ejabberdctl	55	- $(INSTALL) -m 550 $(G_USER) ejabberdctl.example $(SBINDIR)/ejabberdctl
58	+ $(INSTALL) -m 555 $(G_USER) ejabberdctl.example $(SBINDIR)/ejabberdctl	56	+ $(INSTALL) -m 555 $(G_USER) ejabberdctl.example $(SBINDIR)/ejabberdctl
59	#	57	# Elixir binaries
60	# Init script	58	[ -d $(BINDIR) ] \|\| $(INSTALL) -d -m 755 $(BINDIR)
61	$(SED) -e "s@ctlscriptpath@$(SBINDIR)*" \	59	-[ -f deps/elixir/bin/iex ] && $(INSTALL) -m 550 $(G_USER) deps/elixir/bin/iex $(BINDIR)/iex
62	@@ -184,6 +181,7 @@	60	@@ -196,6 +193,7 @@
63	chmod -R 750 $(LOGDIR)	61	chmod -R 750 $(LOGDIR)
64	#	62	#
65	# Documentation	63	# Documentation
Lines 67-73 Link Here
67	$(INSTALL) -d $(DOCDIR)	65	$(INSTALL) -d $(DOCDIR)
68	[ -f doc/dev.html ] \	66	[ -f doc/dev.html ] \
69	&& $(INSTALL) -m 644 doc/dev.html $(DOCDIR) \	67	&& $(INSTALL) -m 644 doc/dev.html $(DOCDIR) \
70	@@ -196,6 +194,7 @@	68	@@ -208,6 +206,7 @@
71	\|\| echo "No doc/guide.pdf was built"	69	\|\| echo "No doc/guide.pdf was built"
72	$(INSTALL) -m 644 doc/*.png $(DOCDIR)	70	$(INSTALL) -m 644 doc/*.png $(DOCDIR)
73	$(INSTALL) -m 644 COPYING $(DOCDIR)	71	$(INSTALL) -m 644 COPYING $(DOCDIR)