diff options
| -rw-r--r-- | news/nntp/Makefile | 28 | ||||
| -rw-r--r-- | news/nntp/pkg-plist | 4 |
2 files changed, 17 insertions, 15 deletions
diff --git a/news/nntp/Makefile b/news/nntp/Makefile index 2de9846b1662..c6ffce2c1b25 100644 --- a/news/nntp/Makefile +++ b/news/nntp/Makefile @@ -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 <bsd.port.options.mk> 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 <bsd.port.mk> diff --git a/news/nntp/pkg-plist b/news/nntp/pkg-plist index d8b92d8a1007..8253cf55caf7 100644 --- a/news/nntp/pkg-plist +++ b/news/nntp/pkg-plist @@ -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 |