Attachment #140985 for bug #187703

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

Lines 19-45 Link Here

(-)Makefile (-12 / +11 lines)
19		19
20	LIB_DEPENDS= idn:${PORTSDIR}/dns/libidn	20	LIB_DEPENDS= idn:${PORTSDIR}/dns/libidn
21		21
		22	USERS= prosody
		23	GROUPS= ${USERS}
		24
22	USE_RC_SUBR= prosody	25	USE_RC_SUBR= prosody
23	MAN1= prosodyctl.1
24	MANCOMPRESSED= no	26	MANCOMPRESSED= no
25		27
		28	USES= gmake shebangfix
26	USE_LUA= 5.1	29	USE_LUA= 5.1
27	WANT_LUA_VER= 5.1	30	WANT_LUA_VER= 5.1
28	USE_GMAKE= yes	31	SHEBANG_LANG= lua
		32	SHEBANG_FILES= prosody prosodyctl
		33	lua_OLD_CMD= ${SETENV} lua
		34	lua_CMD= ${LUA_CMD}
29		35
30	HAS_CONFIGURE= yes	36	HAS_CONFIGURE= yes
31	CONFIGURE_ARGS+= --ostype=freebsd --c-compiler="${CC}" --linker="${LD}"	37	CONFIGURE_ARGS+= --ostype=freebsd --c-compiler="${CC}" --linker="${LD}"
32	CONFIGURE_ENV+= LOCALBASE="${LOCALBASE}" PREFIX="${PREFIX}" LUA_SUFFIX="-${LUA_VER}" LUA_LIBDIR="${LUA_LIBDIR}" LUA_INCDIR="${LUA_INCDIR}"	38	CONFIGURE_ENV+= LOCALBASE="${LOCALBASE}" PREFIX="${PREFIX}" LUA_SUFFIX="-${LUA_VER}" LUA_LIBDIR="${LUA_LIBDIR}" LUA_INCDIR="${LUA_INCDIR}"
33		39
34	SUB_FILES= pkg-install pkg-deinstall	40	SUB_FILES= deinstall
		41	SUB_LIST= USERS=${USERS} GROUPS=${GROUPS}
		42	PLIST_SUB= PROSODY_USER=${USERS} PROSODY_GROUP=${GROUPS}
35		43
36	NO_STAGE= yes
37	pre-install:
38	${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
39	${REINPLACE_CMD} -e 's\|/usr/bin/env lua\|${LUA_CMD}\|' ${WRKSRC}/prosody.install ${WRKSRC}/prosodyctl.install
40
41	post-install:
42	${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
43	@${CAT} ${PKGMESSAGE}
44
45	.include <bsd.port.mk>	44	.include <bsd.port.mk>




--- Makefile.orig	2014-01-12 05:41:40.000000000 -0600
+++ Makefile	2014-03-15 11:58:25.725744098 -0500
@@ -6,7 +6,7 @@
 MODULES = $(DESTDIR)$(PREFIX)/lib/prosody/modules
 SOURCE = $(DESTDIR)$(PREFIX)/lib/prosody

 
 INSTALLEDSOURCE = $(PREFIX)/lib/prosody
 INSTALLEDCONFIG = $(SYSCONFDIR)
@@ -40,7 +40,7 @@
 	umask 0022 && cp -r plugins/* $(MODULES)
 	install -m644 certs/* $(CONFIG)/certs
 	install -m644 man/prosodyctl.man $(MAN)/man1/prosodyctl.1
-	test -e $(CONFIG)/prosody.cfg.lua || install -m644 prosody.cfg.lua.install $(CONFIG)/prosody.cfg.lua
+	install -m644 prosody.cfg.lua.install $(CONFIG)/prosody.cfg.lua.sample
 	test -e $(CONFIG)/prosody.cfg.lua || install -m644 prosody.cfg.lua.install $(CONFIG)/prosody.cfg.lua
 	test -e prosody.version && install -m644 prosody.version $(SOURCE)/prosody.version || true
 	$(MAKE) install -C util-src
 




	echo "     Note:"
	echo "     Prosody related user accounts and groups were not removed."
	echo ""
	echo "     To remove the user and group which were created by "
	echo "     the installation of this package, run:"
	echo ""
	echo "     pw userdel -n %%USERS%%"
	echo "     pw groupdel -n %%GROUPS%%"
	echo ""
	echo "     and to remove all server data:"
	echo "     rm -rf  /usr/local/var/lib/prosody"
	echo ""
	;;
*)
	;;
esac
exit 0

Lines 136-141 Link Here

(-)pkg-plist (+5 lines)
136	lib/prosody/util/sasl/plain.lua	136	lib/prosody/util/sasl/plain.lua
137	lib/prosody/util/sasl/scram.lua	137	lib/prosody/util/sasl/scram.lua
138	lib/prosody/util/sasl_cyrus.lua	138	lib/prosody/util/sasl_cyrus.lua
		139	man/man1/prosodyctl.1.gz
139	@dirrmtry etc/prosody/certs	140	@dirrmtry etc/prosody/certs
140	@dirrmtry etc/prosody	141	@dirrmtry etc/prosody
141	@dirrm lib/prosody/util/sasl	142	@dirrm lib/prosody/util/sasl
Lines 149-151 Link Here
149	@dirrm lib/prosody/modules	150	@dirrm lib/prosody/modules
150	@dirrm lib/prosody/core	151	@dirrm lib/prosody/core
151	@dirrm lib/prosody	152	@dirrm lib/prosody
		153	@exec chown -R %%PROSODY_USER%%:%%PROSODY_GROUP%% %D/var/lib/prosody
		154	@dirrmtry var/lib/prosody
		155	@dirrmtry var/lib
		156	@dirrmtry var

Return to bug 187703

Lines 1-5 Link Here

(-)files/patch-Makefile (-4 / +5 lines)
1	--- Makefile.orig 2013-12-08 19:05:39.000000000 +0100	1	--- Makefile.orig 2014-01-12 05:41:40.000000000 -0600
2	+++ Makefile 2014-02-06 23:24:12.000000000 +0100	2	+++ Makefile 2014-03-15 11:58:25.725744098 -0500
3	@@ -6,7 +6,7 @@	3	@@ -6,7 +6,7 @@
4	MODULES = $(DESTDIR)$(PREFIX)/lib/prosody/modules	4	MODULES = $(DESTDIR)$(PREFIX)/lib/prosody/modules
5	SOURCE = $(DESTDIR)$(PREFIX)/lib/prosody	5	SOURCE = $(DESTDIR)$(PREFIX)/lib/prosody
Lines 9-19 Link Here
9		9
10	INSTALLEDSOURCE = $(PREFIX)/lib/prosody	10	INSTALLEDSOURCE = $(PREFIX)/lib/prosody
11	INSTALLEDCONFIG = $(SYSCONFDIR)	11	INSTALLEDCONFIG = $(SYSCONFDIR)
12	@@ -40,6 +40,7 @@	12	@@ -40,7 +40,7 @@
13	umask 0022 && cp -r plugins/* $(MODULES)	13	umask 0022 && cp -r plugins/* $(MODULES)
14	install -m644 certs/* $(CONFIG)/certs	14	install -m644 certs/* $(CONFIG)/certs
15	install -m644 man/prosodyctl.man $(MAN)/man1/prosodyctl.1	15	install -m644 man/prosodyctl.man $(MAN)/man1/prosodyctl.1
		16	- test -e $(CONFIG)/prosody.cfg.lua \|\| install -m644 prosody.cfg.lua.install $(CONFIG)/prosody.cfg.lua
16	+ install -m644 prosody.cfg.lua.install $(CONFIG)/prosody.cfg.lua.sample	17	+ install -m644 prosody.cfg.lua.install $(CONFIG)/prosody.cfg.lua.sample
17	test -e $(CONFIG)/prosody.cfg.lua \|\| install -m644 prosody.cfg.lua.install $(CONFIG)/prosody.cfg.lua
18	test -e prosody.version && install -m644 prosody.version $(SOURCE)/prosody.version \|\| true	18	test -e prosody.version && install -m644 prosody.version $(SOURCE)/prosody.version \|\| true
19	$(MAKE) install -C util-src	19	$(MAKE) install -C util-src
		20

Lines 10-26 Link Here

(-)files/pkg-deinstall.in (-9 / +7 lines)
10	echo " Note:"	10	echo " Note:"
11	echo " Prosody related user accounts and groups were not removed."	11	echo " Prosody related user accounts and groups were not removed."
12	echo ""	12	echo ""
13	echo " To remove the 'prosody' user and the 'prosody' group which were"	13	echo " To remove the user and group which were created by "
14	echo " created by a default installation of this package, run:"	14	echo " the installation of this package, run:"
15	echo ""	15	echo ""
16	echo " pw userdel -n prosody"	16	echo " pw userdel -n %%USERS%%"
17	echo " pw groupdel -n prosody"	17	echo " pw groupdel -n %%GROUPS%%"
18	echo ""	18	echo ""
19	echo " and to remove all server data:"	19	echo " and to remove all server data:"
20	echo " rm -rf /usr/local/var/lib/prosody"	20	echo " rm -rf /usr/local/var/lib/prosody"
21	echo ""	21	echo ""
22	;;	22	;;
23	*)
24	;;
25	esac	23	esac
26	exit 0	24	exit 0