From owner-svn-ports-all@FreeBSD.ORG Fri Nov 29 02:53:50 2013 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 5CC18721; Fri, 29 Nov 2013 02:53:50 +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 3D6A616B1; Fri, 29 Nov 2013 02:53:50 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAT2roeS033162; Fri, 29 Nov 2013 02:53:50 GMT (envelope-from eadler@svn.freebsd.org) Received: (from eadler@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAT2ro3W033161; Fri, 29 Nov 2013 02:53:50 GMT (envelope-from eadler@svn.freebsd.org) Message-Id: <201311290253.rAT2ro3W033161@svn.freebsd.org> From: Eitan Adler Date: Fri, 29 Nov 2013 02:53:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r335138 - head/irc/psybnc 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.16 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: Fri, 29 Nov 2013 02:53:50 -0000 Author: eadler Date: Fri Nov 29 02:53:49 2013 New Revision: 335138 URL: http://svnweb.freebsd.org/changeset/ports/335138 Log: - Stagify - Fix COMMENT Modified: head/irc/psybnc/Makefile Modified: head/irc/psybnc/Makefile ============================================================================== --- head/irc/psybnc/Makefile Fri Nov 29 02:36:38 2013 (r335137) +++ head/irc/psybnc/Makefile Fri Nov 29 02:53:49 2013 (r335138) @@ -8,7 +8,7 @@ MASTER_SITES= http://www.psybnc.at/downl DISTNAME= psyBNC-${DISTVERSION} MAINTAINER= ports@FreeBSD.org -COMMENT= Extremely powerful IRC bouncer +COMMENT= Powerful IRC bouncer WRKSRC= ${WRKDIR}/psybnc PSYBASE?= ${PREFIX}/psybnc @@ -20,7 +20,6 @@ PLIST_SUB= PSYBASE=${PSYBASE:S,^${PREFIX OPTIONS_DEFINE= MENUCONFIG MENUCONFIG_DESC=Configure using menu -NO_STAGE= yes .include .if ${PORT_OPTIONS:MMENUCONFIG} @@ -32,29 +31,28 @@ post-patch: do-configure: .if ${PORT_OPTIONS:MMENUCONFIG} - @cd ${WRKSRC} && make menuconfig + cd ${WRKSRC} && make menuconfig .else # Fool makefile.out into believing certs are unnecessary - @${TOUCH} ${WRKSRC}/key/psybnc.cert.pem + ${TOUCH} ${WRKSRC}/key/psybnc.cert.pem .endif do-install: - @${INSTALL} -d ${PSYBASE}/lang/ ${PSYBASE}/key/ ${PSYBASE}/help/ - @${INSTALL_DATA} ${WRKSRC}/lang/INFO ${PSYBASE}/lang/ - @${INSTALL_DATA} ${WRKSRC}/lang/*.lng ${PSYBASE}/lang/ - @${INSTALL_DATA} ${WRKSRC}/src/ssl.cnf ${PSYBASE}/key/ - @${INSTALL_DATA} ${WRKSRC}/help/*.TXT ${PSYBASE}/help/ - @${INSTALL_DATA} ${WRKSRC}/help/*.DEU ${PSYBASE}/help/ - @${INSTALL_DATA} ${WRKSRC}/help/*.ITA ${PSYBASE}/help/ - ${INSTALL_PROGRAM} ${WRKSRC}/psybnc ${PREFIX}/bin/ - ${INSTALL_DATA} ${WRKSRC}/psybnc.conf ${PREFIX}/etc/psybnc.conf.sample + ${INSTALL} -d ${STAGEDIR}${PSYBASE}/lang/ ${STAGEDIR}${PSYBASE}/key/ ${STAGEDIR}${PSYBASE}/help/ + ${INSTALL_DATA} ${WRKSRC}/lang/INFO ${STAGEDIR}${PSYBASE}/lang/ + ${INSTALL_DATA} ${WRKSRC}/lang/*.lng ${STAGEDIR}${PSYBASE}/lang/ + ${INSTALL_DATA} ${WRKSRC}/src/ssl.cnf ${STAGEDIR}${PSYBASE}/key/ + ${INSTALL_DATA} ${WRKSRC}/help/*.TXT ${STAGEDIR}${PSYBASE}/help/ + ${INSTALL_DATA} ${WRKSRC}/help/*.DEU ${STAGEDIR}${PSYBASE}/help/ + ${INSTALL_DATA} ${WRKSRC}/help/*.ITA ${STAGEDIR}${PSYBASE}/help/ + ${INSTALL_PROGRAM} ${WRKSRC}/psybnc ${STAGEDIR}${PREFIX}/bin/ + ${INSTALL_DATA} ${WRKSRC}/psybnc.conf ${STAGEDIR}${PREFIX}/etc/psybnc.conf.sample post-install: - @if [ -f ${WRKSRC}/key/psybnc.req.pem ]; then \ - ${INSTALL_DATA} ${WRKSRC}/key/psybnc.cert.pem ${PSYBASE}/key/; \ - ${INSTALL_DATA} ${WRKSRC}/key/psybnc.key.pem ${PSYBASE}/key/; \ - ${INSTALL_DATA} ${WRKSRC}/key/psybnc.req.pem ${PSYBASE}/key/; \ + if [ -f ${WRKSRC}/key/psybnc.req.pem ]; then \ + ${INSTALL_DATA} ${WRKSRC}/key/psybnc.cert.pem ${STAGEDIR}${PSYBASE}/key/; \ + ${INSTALL_DATA} ${WRKSRC}/key/psybnc.key.pem ${STAGEDIR}${PSYBASE}/key/; \ + ${INSTALL_DATA} ${WRKSRC}/key/psybnc.req.pem ${STAGEDIR}${PSYBASE}/key/; \ fi - @${CAT} ${PKGMESSAGE} .include