From owner-svn-ports-all@FreeBSD.ORG Mon May 12 09:34:15 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 17316EE4; Mon, 12 May 2014 09:34:15 +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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id EC7942ED3; Mon, 12 May 2014 09:34:14 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4C9YEoJ031106; Mon, 12 May 2014 09:34:14 GMT (envelope-from madpilot@svn.freebsd.org) Received: (from madpilot@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4C9YEZ4031104; Mon, 12 May 2014 09:34:14 GMT (envelope-from madpilot@svn.freebsd.org) Message-Id: <201405120934.s4C9YEZ4031104@svn.freebsd.org> From: Guido Falsi Date: Mon, 12 May 2014 09:34:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r353789 - head/net-im/mu-conference 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.18 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: Mon, 12 May 2014 09:34:15 -0000 Author: madpilot Date: Mon May 12 09:34:14 2014 New Revision: 353789 URL: http://svnweb.freebsd.org/changeset/ports/353789 QAT: https://qat.redports.org/buildarchive/r353789/ Log: - Stage port - Convert to new LIB_DEPENDS format - Fix configuration file handling Modified: head/net-im/mu-conference/Makefile head/net-im/mu-conference/pkg-plist Modified: head/net-im/mu-conference/Makefile ============================================================================== --- head/net-im/mu-conference/Makefile Mon May 12 09:28:16 2014 (r353788) +++ head/net-im/mu-conference/Makefile Mon May 12 09:34:14 2014 (r353789) @@ -3,7 +3,7 @@ PORTNAME= mu-conference PORTVERSION= 0.8 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net-im MASTER_SITES= http://download.gna.org/mu-conference/ DISTNAME= ${PORTNAME}_${PORTVERSION} @@ -13,8 +13,8 @@ COMMENT= Multi-User Conferencing compone LICENSE= GPLv2 -LIB_DEPENDS= expat:${PORTSDIR}/textproc/expat2 \ - idn:${PORTSDIR}/dns/libidn +LIB_DEPENDS= libexpat.so:${PORTSDIR}/textproc/expat2 \ + libidn.so:${PORTSDIR}/dns/libidn USES= pkgconfig USE_GNOME= glib20 @@ -40,8 +40,7 @@ PORTDOCS= * MAKE_JOBS_UNSAFE= yes -NO_STAGE= yes -.include +.include .if ${PORT_OPTIONS:MMYSQL} USE_MYSQL= yes @@ -97,26 +96,20 @@ post-patch: ${WRKSRC}/muc-default.xml do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/src/mu-conference ${PREFIX}/bin - ${INSTALL_DATA} ${WRKSRC}/muc-default.xml ${PREFIX}/etc/muc.xml.sample - @if ! [ -f ${PREFIX}/etc/muc.xml ]; then \ - ${INSTALL_DATA} ${WRKSRC}/muc-default.xml ${PREFIX}/etc/muc.xml; \ - fi -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR}/scripts + ${INSTALL_PROGRAM} ${WRKSRC}/src/mu-conference ${STAGEDIR}${PREFIX}/bin + ${INSTALL_DATA} ${WRKSRC}/muc-default.xml ${STAGEDIR}${PREFIX}/etc/muc.xml.sample +.if ${PORT_OPTIONS:MDOCS} + @${MKDIR} ${STAGEDIR}${DOCSDIR}/scripts .for FILE in README.FreeBSD.jabberd14 README.FreeBSD.jabberd2 README.FreeBSD.external - @${INSTALL_DATA} ${WRKDIR}/${FILE} ${DOCSDIR} + @${INSTALL_DATA} ${WRKDIR}/${FILE} ${STAGEDIR}${DOCSDIR} .endfor .for FILE in ${DOCFILES} - @${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR} + @${INSTALL_DATA} ${WRKSRC}/${FILE} ${STAGEDIR}${DOCSDIR} .endfor - ${INSTALL_DATA} ${WRKSRC}/scripts/README ${DOCSDIR}/scripts + ${INSTALL_DATA} ${WRKSRC}/scripts/README ${STAGEDIR}${DOCSDIR}/scripts .for FILE in roommaker.pl roomname.pl - ${INSTALL_SCRIPT} ${WRKSRC}/scripts/${FILE} ${DOCSDIR}/scripts + ${INSTALL_SCRIPT} ${WRKSRC}/scripts/${FILE} ${STAGEDIR}${DOCSDIR}/scripts .endfor .endif -post-install: - @${CAT} ${PKGMESSAGE} - -.include +.include Modified: head/net-im/mu-conference/pkg-plist ============================================================================== --- head/net-im/mu-conference/pkg-plist Mon May 12 09:28:16 2014 (r353788) +++ head/net-im/mu-conference/pkg-plist Mon May 12 09:34:14 2014 (r353789) @@ -1,4 +1,4 @@ -@unexec if cmp -s %D/etc/muc.xml.sample %D/etc/muc.xml; then rm -f %D/etc/muc.xml; fi bin/mu-conference +@unexec if cmp -s %D/etc/muc.xml.sample %D/etc/muc.xml; then rm -f %D/etc/muc.xml; fi etc/muc.xml.sample -@exec cp -n %D/%F %B/muc.xml +@exec if [ ! -f %D/etc/muc.xml ]; then cp -p %D/%F %B/muc.xml; fi