From owner-svn-ports-all@FreeBSD.ORG Wed Oct 16 02:55:18 2013 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 ESMTP id 4CC07B56; Wed, 16 Oct 2013 02:55:18 +0000 (UTC) (envelope-from eadler@FreeBSD.org) 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 2BD46296D; Wed, 16 Oct 2013 02:55:18 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9G2tI67097718; Wed, 16 Oct 2013 02:55:18 GMT (envelope-from eadler@svn.freebsd.org) Received: (from eadler@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9G2tIQg097717; Wed, 16 Oct 2013 02:55:18 GMT (envelope-from eadler@svn.freebsd.org) Message-Id: <201310160255.r9G2tIQg097717@svn.freebsd.org> From: Eitan Adler Date: Wed, 16 Oct 2013 02:55:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r330473 - head/irc/darkbot 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.14 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: Wed, 16 Oct 2013 02:55:18 -0000 Author: eadler Date: Wed Oct 16 02:55:17 2013 New Revision: 330473 URL: http://svnweb.freebsd.org/changeset/ports/330473 Log: Fix pkg-plist and make poudriere think that its correct. Also, convert to staging This port still needs massive cleanup Modified: head/irc/darkbot/Makefile Modified: head/irc/darkbot/Makefile ============================================================================== --- head/irc/darkbot/Makefile Wed Oct 16 02:41:20 2013 (r330472) +++ head/irc/darkbot/Makefile Wed Oct 16 02:55:17 2013 (r330473) @@ -3,6 +3,7 @@ PORTNAME= darkbot PORTVERSION= 6f6.r6 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= irc MASTER_SITES= http://darkbot.sourceforge.net/archive/unix/ \ @@ -14,48 +15,39 @@ COMMENT= IRC talking bot with a fast alg SUB_FILES= pkg-message -MAN1= darkbot.1 -MANCOMPRESSED= yes - PORTDOCS= README -PLIST_FILES= bin/darkbot %%ETCDIR%%/logs/.pkgcreate +PLIST_FILES= bin/darkbot %%ETCDIR%%/logs/.pkgcreate man/man1/darkbot.1.gz +PLIST_DIRSTRY= %%ETCDIR%%/logs/ %%ETCDIR%%/dat/ %%ETCDIR%% -NO_STAGE= yes .include post-patch: ${CP} ${WRKSRC}/configure ${WRKSRC}/config do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1.gz ${MAN1PREFIX}/man/man1/ - -post-install: - ${MKDIR} ${ETCDIR}/dat ${ETCDIR}/logs - ${TOUCH} ${ETCDIR}/logs/.pkgcreate + ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1.gz ${STAGEDIR}${MAN1PREFIX}/man/man1/ + ${MKDIR} ${STAGEDIR}${ETCDIR}/dat ${STAGEDIR}${ETCDIR}/logs + ${TOUCH} ${STAGEDIR}${ETCDIR}/logs/.pkgcreate cd ${WRKSRC}/dat; \ for file in *; do \ - ${INSTALL_DATA} $$file ${ETCDIR}/dat/$${file}.dist; \ - ${CP} -np ${ETCDIR}/dat/$${file}.dist ${ETCDIR}/dat/$$file || ${TRUE} ; \ + ${INSTALL_DATA} $$file ${STAGEDIR}${ETCDIR}/dat/$${file}.dist; \ + ${CP} -np ${ETCDIR}/dat/$${file}.dist ${STAGEDIR}${ETCDIR}/dat/$$file || ${TRUE} ; \ ${ECHO_CMD} "@unexec cmp -s ${ETCDIR}/dat/$$file \ ${ETCDIR}/dat/$${file}.dist && \ rm -f ${ETCDIR}/dat/$$file || true" >> ${TMPPLIST}; \ ${ECHO_CMD} "${ETCDIR_REL}/dat/$${file}.dist" >> ${TMPPLIST}; \ ${ECHO_CMD} "@exec cp -np %D/%F %B/$$file || true" >> ${TMPPLIST}; \ done - ${ECHO_CMD} "@unexec rmdir ${ETCDIR}/logs 2>/dev/null || true" >> ${TMPPLIST} - ${ECHO_CMD} "@unexec rmdir ${ETCDIR}/dat 2>/dev/null || true" >> ${TMPPLIST} - ${ECHO_CMD} "@unexec rmdir ${ETCDIR} 2>/dev/null || true" >> ${TMPPLIST} ${ECHO_CMD} '#!/bin/sh' > ${WRKSRC}/configure ${ECHO_CMD} 'cd ${ETCDIR} && ${SH} config' >> ${WRKSRC}/configure .for s in config configure AddServer Adduser - ${INSTALL_SCRIPT} ${WRKSRC}/$s ${ETCDIR} + ${INSTALL_SCRIPT} ${WRKSRC}/$s ${STAGEDIR}${ETCDIR} ${ECHO_CMD} ${ETCDIR_REL}/$s >> ${TMPPLIST} .endfor .if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/docs/README ${DOCSDIR}/ + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/docs/README ${STAGEDIR}${DOCSDIR}/ .endif - @${CAT} ${PKGMESSAGE} .include