diff options
| -rw-r--r-- | news/trn/Makefile | 2 | ||||
| -rw-r--r-- | news/trn4/Makefile | 10 |
2 files changed, 8 insertions, 4 deletions
diff --git a/news/trn/Makefile b/news/trn/Makefile index 494ac5d0dcf1..83b79bf1a50b 100644 --- a/news/trn/Makefile +++ b/news/trn/Makefile @@ -16,6 +16,8 @@ COMMENT= Threaded Read News newsreader RUN_DEPENDS= munpack:${PORTSDIR}/converters/mpack +CONFLICTS_INSTALL=trn-4.[0-9]* + WRKSRC= ${WRKDIR}/trn-3.6 MAN1= trn.1 Pnews.1 Rnmail.1 newsetup.1 newsgroups.1 diff --git a/news/trn4/Makefile b/news/trn4/Makefile index 0e65b4473b21..ba33d17f1f44 100644 --- a/news/trn4/Makefile +++ b/news/trn4/Makefile @@ -14,6 +14,8 @@ DISTNAME= ${PORTNAME}-${PORTVERSION:S/.b/-test/} MAINTAINER= johans@FreeBSD.org COMMENT= Version 4.0 of the threaded readnews newsreader +CONFLICTS_INSTALL=trn-3.[0-9]* inn-[0-9]* cnews-* s-news-[0-9]* + NO_LATEST_LINK= yes MAN1= trn.1 Pnews.1 Rnmail.1 @@ -21,13 +23,13 @@ MAN1= trn.1 Pnews.1 Rnmail.1 pre-configure: @${ECHO_MSG} "===> Running pre-configure target for ${DISTNAME}" - @${SED} -e "s:__CC__:$(CC):" -e "s:__CFLAGS__:$(CFLAGS):" \ - -e "s:/PREFIX:$(PREFIX):" ${SCRIPTDIR}/preconf > \ + @${SED} -e "s:__CC__:${CC}:" -e "s:__CFLAGS__:${CFLAGS}:" \ + -e "s:/PREFIX:${PREFIX}:" ${SCRIPTDIR}/preconf > \ ${WRKDIR}/preconf.new .ifdef BATCH - @echo 3 | sh ${WRKDIR}/preconf.new ${PORTSDIR} ${.CURDIR} ${WRKSRC} + @${ECHO_CMD} 3 | ${SH} ${WRKDIR}/preconf.new ${PORTSDIR} ${.CURDIR} ${WRKSRC} .else - @sh ${WRKDIR}/preconf.new ${PORTSDIR} ${.CURDIR} ${WRKSRC} + @${SH} ${WRKDIR}/preconf.new ${PORTSDIR} ${.CURDIR} ${WRKSRC} .endif .include <bsd.port.post.mk> |