Attachment #98572 for bug #137507

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

Lines 7-12 Link Here

(-)prosody/Makefile (-2 / +3 lines)
7		7
8	PORTNAME= prosody	8	PORTNAME= prosody
9	PORTVERSION= 0.5.1	9	PORTVERSION= 0.5.1
		10	PORTREVISION= 1
		11
10	CATEGORIES= net-im	12	CATEGORIES= net-im
11	MASTER_SITES= http://prosody.im/downloads/source/	13	MASTER_SITES= http://prosody.im/downloads/source/
12		14
Lines 29-39 Link Here
29	CONFIGURE_ARGS+="--ostype=freebsd"	31	CONFIGURE_ARGS+="--ostype=freebsd"
30	CONFIGURE_ENV+= LOCALBASE="${LOCALBASE}" LUA_SUFFIX="-${LUA_VER}" LUA_LIBDIR="${LUA_LIBDIR}" LUA_INCDIR="${LUA_INCDIR}"	32	CONFIGURE_ENV+= LOCALBASE="${LOCALBASE}" LUA_SUFFIX="-${LUA_VER}" LUA_LIBDIR="${LUA_LIBDIR}" LUA_INCDIR="${LUA_INCDIR}"
31		33
32	SUB_FILES= pkg-install pkg-deinstall prosody.cfg.lua.install	34	SUB_FILES= pkg-install pkg-deinstall
33		35
34	pre-install:	36	pre-install:
35	${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL	37	${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
36	${MV} ${WRKDIR}/prosody.cfg.lua.install ${WRKSRC}/prosody.cfg.lua.install
37	${REINPLACE_CMD} -e 's\|/usr/bin/env lua\|${LUA_CMD}\|' ${WRKSRC}/prosody ${WRKSRC}/prosodyctl	38	${REINPLACE_CMD} -e 's\|/usr/bin/env lua\|${LUA_CMD}\|' ${WRKSRC}/prosody ${WRKSRC}/prosodyctl
38		39
39	post-install:	40	post-install:




--- Makefile.orig	2009-07-29 12:54:54.000000000 -0500
+++ Makefile	2009-08-06 21:25:36.000000000 -0500
@@ -6,7 +6,7 @@
 MODULES = $(DESTDIR)$(PREFIX)/lib/prosody/modules
 SOURCE = $(DESTDIR)$(PREFIX)/lib/prosody

 
 INSTALLEDSOURCE = $(PREFIX)/lib/prosody
 INSTALLEDCONFIG = $(SYSCONFDIR)
@@ -29,10 +29,11 @@
 	install -m644 util/* $(SOURCE)/util
 	install -m644 fallbacks/* $(SOURCE)/fallbacks
 	install -m644 plugins/* $(MODULES)
-	install -m644 certs/* $(CONFIG)/certs
+	install -m644 certs/localhost.cert $(CONFIG)/certs/localhost.cert.sample
+	install -m644 certs/localhost.key $(CONFIG)/certs/localhost.key.sample
 	install -m644 plugins/* $(MODULES)
 	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 prosody.version && install prosody.version $(SOURCE)/prosody.version || true
 	$(MAKE) install -C util-src
 

Lines 40-46 Link Here

(-)prosody/files/pkg-install.in (-1 / +6 lines)
40	;;	40	;;
41		41
42	POST-INSTALL)	42	POST-INSTALL)
43	chown "${USER}" $PREFIX/var/lib/prosody	43	chown "${USER}:${GROUP}" $PREFIX/var/lib/prosody
		44	for file in `find $PREFIX/etc/prosody -type f`; do
		45	if [ ! -s "${file%.sample}" ]; then
		46	cp -p $file ${file%.sample}
		47	fi
		48	done
44	;;	49	;;
45	*)	50	*)
46	echo "?"	51	echo "?"

Lines 1-95 Link Here

(-)prosody/files/prosody.cfg.lua.install.in




bin/prosody
bin/prosodyctl
@unexec if cmp -s %D/etc/prosody/prosody.cfg.lua.sample %D/etc/prosody/prosody.cfg.lua; then rm -f %D/etc/prosody/prosody.cfg.lua; fi
etc/prosody/prosody.cfg.lua.sample
@exec if [ ! -f %D/etc/prosody/prosody.cfg.lua ]; then cp -p %D/etc/prosody/prosody.cfg.lua.sample %D/etc/prosody/prosody.cfg.lua; fi
@unexec if cmp -s %D/etc/prosody/certs/localhost.cert.sample %D/etc/prosody/certs/localhost.cert; then rm -f %D/etc/prosody/certs/localhost.cert; fi
etc/prosody/certs/localhost.cert.sample
@exec if [ ! -f %D/etc/prosody/certs/localhost.cert ]; then cp -p %D/etc/prosody/certs/localhost.cert.sample %D/etc/prosody/certs/localhost.cert; fi
@unexec if cmp -s %D/etc/prosody/certs/localhost.key.sample %D/etc/prosody/certs/localhost.key; then rm -f %D/etc/prosody/certs/localhost.key; fi
etc/prosody/certs/localhost.key.sample
@exec if [ ! -f %D/etc/prosody/certs/localhost.key ]; then cp -p %D/etc/prosody/certs/localhost.key.sample %D/etc/prosody/certs/localhost.key; fi
@dirrmtry etc/prosody/certs
@dirrmtry etc/prosody
lib/prosody/core/actions.lua
lib/prosody/core/componentmanager.lua
lib/prosody/core/configmanager.lua

Return to bug 137507

Lines 1-5 Link Here

(-)prosody/files/patch-Makefile (-2 / +16 lines)
1	--- Makefile.orig 2009-07-27 18:22:51.000000000 +0000	1	--- Makefile.orig 2009-07-29 12:54:54.000000000 -0500
2	+++ Makefile 2009-07-27 18:23:25.000000000 +0000	2	+++ Makefile 2009-08-06 21:25:36.000000000 -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-11 Link Here
9		9
10	INSTALLEDSOURCE = $(PREFIX)/lib/prosody	10	INSTALLEDSOURCE = $(PREFIX)/lib/prosody
11	INSTALLEDCONFIG = $(SYSCONFDIR)	11	INSTALLEDCONFIG = $(SYSCONFDIR)
		12	@@ -29,10 +29,11 @@
		13	install -m644 util/* $(SOURCE)/util
		14	install -m644 fallbacks/* $(SOURCE)/fallbacks
		15	install -m644 plugins/* $(MODULES)
		16	- install -m644 certs/* $(CONFIG)/certs
		17	+ install -m644 certs/localhost.cert $(CONFIG)/certs/localhost.cert.sample
		18	+ install -m644 certs/localhost.key $(CONFIG)/certs/localhost.key.sample
		19	install -m644 plugins/* $(MODULES)
		20	install -m644 man/prosodyctl.man $(MAN)/man1/prosodyctl.1
		21	- test -e $(CONFIG)/prosody.cfg.lua \|\| install -m644 prosody.cfg.lua.install $(CONFIG)/prosody.cfg.lua
		22	+ install -m644 prosody.cfg.lua.install $(CONFIG)/prosody.cfg.lua.sample
		23	test -e prosody.version && install prosody.version $(SOURCE)/prosody.version \|\| true
		24	$(MAKE) install -C util-src
		25

Lines 1-5 Link Here

(-)prosody/pkg-plist (+11 lines)
1	bin/prosody	1	bin/prosody
2	bin/prosodyctl	2	bin/prosodyctl
		3	@unexec if cmp -s %D/etc/prosody/prosody.cfg.lua.sample %D/etc/prosody/prosody.cfg.lua; then rm -f %D/etc/prosody/prosody.cfg.lua; fi
		4	etc/prosody/prosody.cfg.lua.sample
		5	@exec if [ ! -f %D/etc/prosody/prosody.cfg.lua ]; then cp -p %D/etc/prosody/prosody.cfg.lua.sample %D/etc/prosody/prosody.cfg.lua; fi
		6	@unexec if cmp -s %D/etc/prosody/certs/localhost.cert.sample %D/etc/prosody/certs/localhost.cert; then rm -f %D/etc/prosody/certs/localhost.cert; fi
		7	etc/prosody/certs/localhost.cert.sample
		8	@exec if [ ! -f %D/etc/prosody/certs/localhost.cert ]; then cp -p %D/etc/prosody/certs/localhost.cert.sample %D/etc/prosody/certs/localhost.cert; fi
		9	@unexec if cmp -s %D/etc/prosody/certs/localhost.key.sample %D/etc/prosody/certs/localhost.key; then rm -f %D/etc/prosody/certs/localhost.key; fi
		10	etc/prosody/certs/localhost.key.sample
		11	@exec if [ ! -f %D/etc/prosody/certs/localhost.key ]; then cp -p %D/etc/prosody/certs/localhost.key.sample %D/etc/prosody/certs/localhost.key; fi
		12	@dirrmtry etc/prosody/certs
		13	@dirrmtry etc/prosody
3	lib/prosody/core/actions.lua	14	lib/prosody/core/actions.lua
4	lib/prosody/core/componentmanager.lua	15	lib/prosody/core/componentmanager.lua
5	lib/prosody/core/configmanager.lua	16	lib/prosody/core/configmanager.lua