From owner-svn-ports-all@FreeBSD.ORG Tue Mar 18 20:19:35 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 92FD968F; Tue, 18 Mar 2014 20:19:35 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 73879976; Tue, 18 Mar 2014 20:19:35 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2IKJZxs028703; Tue, 18 Mar 2014 20:19:35 GMT (envelope-from lx@svn.freebsd.org) Received: (from lx@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2IKJYTf028699; Tue, 18 Mar 2014 20:19:34 GMT (envelope-from lx@svn.freebsd.org) Message-Id: <201403182019.s2IKJYTf028699@svn.freebsd.org> From: David Thiel Date: Tue, 18 Mar 2014 20:19:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r348595 - in head/net-im/prosody: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 Mar 2014 20:19:35 -0000 Author: lx Date: Tue Mar 18 20:19:34 2014 New Revision: 348595 URL: http://svnweb.freebsd.org/changeset/ports/348595 QAT: https://qat.redports.org/buildarchive/r348595/ Log: Stageify and modernize. PR: ports/187703 Submitted by: Scot Hetzel Reviewed by: me Deleted: head/net-im/prosody/files/pkg-install.in Modified: head/net-im/prosody/Makefile head/net-im/prosody/files/patch-Makefile head/net-im/prosody/files/pkg-deinstall.in head/net-im/prosody/pkg-plist Modified: head/net-im/prosody/Makefile ============================================================================== --- head/net-im/prosody/Makefile Tue Mar 18 20:14:23 2014 (r348594) +++ head/net-im/prosody/Makefile Tue Mar 18 20:19:34 2014 (r348595) @@ -17,29 +17,28 @@ RUN_DEPENDS= ${LUA_MODLIBDIR}/socket/cor ${LUA_MODLIBDIR}/lxp.so:${PORTSDIR}/textproc/luaexpat \ ${LUA_MODLIBDIR}/lfs.so:${PORTSDIR}/devel/luafilesystem \ -LIB_DEPENDS= idn:${PORTSDIR}/dns/libidn +LIB_DEPENDS= libidn:${PORTSDIR}/dns/libidn + +USERS= prosody +GROUPS= ${USERS} USE_RC_SUBR= prosody -MAN1= prosodyctl.1 MANCOMPRESSED= no +USES= gmake shebangfix USE_LUA= 5.1 WANT_LUA_VER= 5.1 -USE_GMAKE= yes +SHEBANG_LANG= lua +SHEBANG_FILES= prosody prosodyctl +lua_OLD_CMD= ${SETENV} lua +lua_CMD= ${LUA_CMD} HAS_CONFIGURE= yes CONFIGURE_ARGS+= --ostype=freebsd --c-compiler="${CC}" --linker="${LD}" CONFIGURE_ENV+= LOCALBASE="${LOCALBASE}" PREFIX="${PREFIX}" LUA_SUFFIX="-${LUA_VER}" LUA_LIBDIR="${LUA_LIBDIR}" LUA_INCDIR="${LUA_INCDIR}" -SUB_FILES= pkg-install pkg-deinstall - -NO_STAGE= yes -pre-install: - ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL - ${REINPLACE_CMD} -e 's|/usr/bin/env lua|${LUA_CMD}|' ${WRKSRC}/prosody.install ${WRKSRC}/prosodyctl.install - -post-install: - ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL - @${CAT} ${PKGMESSAGE} +SUB_FILES= deinstall +SUB_LIST= USERS=${USERS} GROUPS=${GROUPS} +PLIST_SUB= PROSODY_USER=${USERS} PROSODY_GROUP=${GROUPS} .include Modified: head/net-im/prosody/files/patch-Makefile ============================================================================== --- head/net-im/prosody/files/patch-Makefile Tue Mar 18 20:14:23 2014 (r348594) +++ head/net-im/prosody/files/patch-Makefile Tue Mar 18 20:19:34 2014 (r348595) @@ -1,5 +1,5 @@ ---- Makefile.orig 2013-12-08 19:05:39.000000000 +0100 -+++ Makefile 2014-02-06 23:24:12.000000000 +0100 +--- 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 @@ -9,11 +9,12 @@ INSTALLEDSOURCE = $(PREFIX)/lib/prosody INSTALLEDCONFIG = $(SYSCONFDIR) -@@ -40,6 +40,7 @@ +@@ -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 + Modified: head/net-im/prosody/files/pkg-deinstall.in ============================================================================== --- head/net-im/prosody/files/pkg-deinstall.in Tue Mar 18 20:14:23 2014 (r348594) +++ head/net-im/prosody/files/pkg-deinstall.in Tue Mar 18 20:19:34 2014 (r348595) @@ -10,17 +10,15 @@ POST-DEINSTALL) echo " Note:" echo " Prosody related user accounts and groups were not removed." echo "" - echo " To remove the 'prosody' user and the 'prosody' group which were" - echo " created by a default installation of this package, run:" + echo " To remove the user and group which were created by " + echo " the installation of this package, run:" echo "" - echo " pw userdel -n prosody" - echo " pw groupdel -n prosody" + 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 "" - echo " and to remove all server data:" - echo " rm -rf /usr/local/var/lib/prosody" - echo "" - ;; -*) ;; esac exit 0 Modified: head/net-im/prosody/pkg-plist ============================================================================== --- head/net-im/prosody/pkg-plist Tue Mar 18 20:14:23 2014 (r348594) +++ head/net-im/prosody/pkg-plist Tue Mar 18 20:19:34 2014 (r348595) @@ -136,6 +136,7 @@ lib/prosody/util/sasl/digest-md5.lua lib/prosody/util/sasl/plain.lua lib/prosody/util/sasl/scram.lua lib/prosody/util/sasl_cyrus.lua +man/man1/prosodyctl.1.gz @dirrmtry etc/prosody/certs @dirrmtry etc/prosody @dirrm lib/prosody/util/sasl @@ -149,3 +150,7 @@ lib/prosody/util/sasl_cyrus.lua @dirrm lib/prosody/modules @dirrm lib/prosody/core @dirrm lib/prosody +@exec chown -R %%PROSODY_USER%%:%%PROSODY_GROUP%% %D/var/lib/prosody +@dirrmtry var/lib/prosody +@dirrmtry var/lib +@dirrmtry var