From owner-svn-ports-head@FreeBSD.ORG Thu Dec 19 07:39:15 2013 Return-Path: Delivered-To: svn-ports-head@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 50C8ED94; Thu, 19 Dec 2013 07:39: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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 23C24145D; Thu, 19 Dec 2013 07:39:15 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBJ7dFgO005058; Thu, 19 Dec 2013 07:39:15 GMT (envelope-from dinoex@svn.freebsd.org) Received: (from dinoex@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBJ7dEXh005055; Thu, 19 Dec 2013 07:39:14 GMT (envelope-from dinoex@svn.freebsd.org) Message-Id: <201312190739.rBJ7dEXh005055@svn.freebsd.org> From: Dirk Meyer Date: Thu, 19 Dec 2013 07:39:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336877 - head/news/nntp X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Dec 2013 07:39:15 -0000 Author: dinoex Date: Thu Dec 19 07:39:14 2013 New Revision: 336877 URL: http://svnweb.freebsd.org/changeset/ports/336877 Log: - use STAGEDIR Modified: head/news/nntp/Makefile head/news/nntp/pkg-plist Modified: head/news/nntp/Makefile ============================================================================== --- head/news/nntp/Makefile Thu Dec 19 07:26:07 2013 (r336876) +++ head/news/nntp/Makefile Thu Dec 19 07:39:14 2013 (r336877) @@ -3,7 +3,7 @@ PORTNAME= nntp PORTVERSION= 1.5.12.2 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= news MASTER_SITES= ftp://ftp.dinoex.org/pub/c-news/ DISTNAME= ${PORTNAME}.${PORTVERSION} @@ -16,8 +16,6 @@ COMMENT= NNTP with NOV support BUILD_DEPENDS= ${LOCALBASE}/lib/libcnews.a:${PORTSDIR}/news/cnews -NO_STAGE= yes - NO_WRKSUBDIR= yes MAN1= nntpxmit.1 MAN8= nntpd.8c acttimes.8c @@ -32,18 +30,19 @@ VARBASE?= /var NEWSBIN?= ${PREFIX}/libexec/cnews NEWSCTL?= ${VARBASE}/lib/news NEWSARTS?= ${VARBASE}/news -NEWSOV?= ${VARBASE}/news +NEWSOV?= ${VARBASE}/news/over.view MAKE_ENV+= DBLIBS="${LOCALBASE}/lib/libcnews.a -lcrypt -lutil" -MAKE_ENV+= ETCDIR="${LOCALBASE}/sbin" BINDIR="${NEWSBIN}" -MAKE_ENV+= MANDIR="${LOCALBASE}/man" +MAKE_ENV+= ETCDIR="${STAGEDIR}${PREFIX}/sbin" +MAKE_ENV+= BINDIR="${STAGEDIR}${NEWSBIN}" +MAKE_ENV+= MANDIR="${STAGEDIR}${PREFIX}/man" OPTIONS_DEFINE= DOCS .include post-extract: - @${CP} ${WRKSRC}/conf.h.dist ${WRKSRC}/conf.h + ${CP} ${WRKSRC}/conf.h.dist ${WRKSRC}/conf.h pre-configure: ${REINPLACE_CMD} \ @@ -57,17 +56,18 @@ pre-configure: -e "s=/usr/local/man=${PREFIX}/man=" \ ${WRKSRC}/conf.h +pre-install: + ${MKDIR} ${STAGEDIR}${NEWSBIN} + post-install: - ${INSTALL_DATA} ${WRKSRC}/overview.fmt ${NEWSCTL}/overview.fmt + ${MKDIR} ${STAGEDIR}${NEWSCTL} + ${INSTALL_DATA} ${WRKSRC}/overview.fmt ${STAGEDIR}${NEWSCTL}/overview.fmt .if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${DOCSFILES1:S=^=${WRKSRC}/=} ${DOCSDIR}/ + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${DOCSFILES1:S=^=${WRKSRC}/=} ${STAGEDIR}${DOCSDIR}/ .for i in ${DOCSFILES2} - ${INSTALL_DATA} ${WRKSRC}/${i}/README ${DOCSDIR}/${i}-README + ${INSTALL_DATA} ${WRKSRC}/${i}/README ${STAGEDIR}${DOCSDIR}/${i}-README .endfor .endif - @${ECHO_MSG} - @${CAT} ${PKGMESSAGE} - @${ECHO_MSG} .include Modified: head/news/nntp/pkg-plist ============================================================================== --- head/news/nntp/pkg-plist Thu Dec 19 07:26:07 2013 (r336876) +++ head/news/nntp/pkg-plist Thu Dec 19 07:39:14 2013 (r336877) @@ -1,8 +1,10 @@ +man/man1/nntpxmit.1.gz +man/man8/nntpd.8c.gz +man/man8/acttimes.8c.gz sbin/nntpd %%NEWSBIN%%/acttimes %%NEWSBIN%%/nntpxmit %%NEWSBIN%%/nntpxfer -@comment just in case anyone wants it %%NEWSBIN%%/shlock %%PORTDOCS%%%%DOCSDIR%%/AUTHORIZE %%PORTDOCS%%%%DOCSDIR%%/CHANGES