diff options
author | Bryan Drewery <bdrewery@FreeBSD.org> | 2015-09-21 22:09:08 +0000 |
---|---|---|
committer | Bryan Drewery <bdrewery@FreeBSD.org> | 2015-09-21 22:09:08 +0000 |
commit | 2ded93783ddc75c7b2bf26b9dc79624b6d273381 (patch) | |
tree | 32d85e5b5f352cae00c190004aa74fd817559cef /news | |
parent | - Update to 1.5.1 (diff) |
Rework husky ports to use a more conventional MASTER/SLAVE port pattern.
- Remove Makefile.local as it is intended to be a user file that should
not be committed. Its documentation is poor (r12873) but users are
relying on it.
- Remove CONFLICTS as for every port it just conflicted with itself.
With hat: portmgr
Notes
Notes:
svn path=/head/; revision=397523
Diffstat (limited to '')
-rw-r--r-- | news/husky-areafix/Makefile | 4 | ||||
-rw-r--r-- | news/husky-fidoconf/Makefile | 4 | ||||
-rw-r--r-- | news/husky-hpt/Makefile | 4 | ||||
-rw-r--r-- | news/husky-htick/Makefile | 4 | ||||
-rw-r--r-- | news/husky-huskylib/Makefile | 4 | ||||
-rw-r--r-- | news/husky-smapi/Makefile | 5 | ||||
-rw-r--r-- | news/husky/Makefile | 31 | ||||
-rw-r--r-- | news/husky/Makefile.local | 32 |
8 files changed, 34 insertions, 54 deletions
diff --git a/news/husky-areafix/Makefile b/news/husky-areafix/Makefile index 94a706709163..4c205e9bff28 100644 --- a/news/husky-areafix/Makefile +++ b/news/husky-areafix/Makefile @@ -1,9 +1,7 @@ # $FreeBSD$ PORTNAME= husky-areafix -CATEGORIES= news mail -MAINTAINER= osharoiko@gmail.com COMMENT= Husky FTN areafix library LIB_DEPENDS= libfidoconfig.so:${PORTSDIR}/news/husky-fidoconf @@ -13,4 +11,4 @@ USE_LDCONFIG= yes MASTERDIR= ${.CURDIR}/../husky COMPONENT_SUBDIR= areafix -.include <bsd.port.mk> +.include "${MASTERDIR}/Makefile" diff --git a/news/husky-fidoconf/Makefile b/news/husky-fidoconf/Makefile index 09c99ebea3df..d7ba043dbbad 100644 --- a/news/husky-fidoconf/Makefile +++ b/news/husky-fidoconf/Makefile @@ -1,9 +1,7 @@ # $FreeBSD$ PORTNAME= husky-fidoconf -CATEGORIES= news mail -MAINTAINER= osharoiko@gmail.com COMMENT= Husky FTN configuration library LIB_DEPENDS= libsmapi.so:${PORTSDIR}/news/husky-smapi @@ -39,4 +37,4 @@ post-install: ${LN} -sf fconf2.1 ${STAGEDIR}${PREFIX}/man/man1/fconf2tornado.1 ${LN} -sf fconf2.1 ${STAGEDIR}${PREFIX}/man/man1/fecfg2fconf.1 -.include <bsd.port.mk> +.include "${MASTERDIR}/Makefile" diff --git a/news/husky-hpt/Makefile b/news/husky-hpt/Makefile index c992677ea042..9243d282f396 100644 --- a/news/husky-hpt/Makefile +++ b/news/husky-hpt/Makefile @@ -1,9 +1,7 @@ # $FreeBSD$ PORTNAME= husky-hpt -CATEGORIES= news mail -MAINTAINER= osharoiko@gmail.com COMMENT= Husky FTN tosser LIB_DEPENDS= libfidoconfig.so:${PORTSDIR}/news/husky-fidoconf \ @@ -25,4 +23,4 @@ post-patch: ${REINPLACE_CMD} -e 's^/fido/etc/config^${PREFIX}/etc/fido/config^' \ ${WRKSRC}/man/txt2pkt.1 -.include <bsd.port.mk> +.include "${MASTERDIR}/Makefile" diff --git a/news/husky-htick/Makefile b/news/husky-htick/Makefile index 452ed7441492..9c34e751ddfa 100644 --- a/news/husky-htick/Makefile +++ b/news/husky-htick/Makefile @@ -1,9 +1,7 @@ # $FreeBSD$ PORTNAME= husky-htick -CATEGORIES= news mail -MAINTAINER= osharoiko@gmail.com COMMENT= Husky FTN file ticker LIB_DEPENDS= libfidoconfig.so:${PORTSDIR}/news/husky-fidoconf \ @@ -29,4 +27,4 @@ post-patch: ${REINPLACE_CMD} -e 's^/fido/etc/config^${PREFIX}/etc/fido/config^' \ ${WRKSRC}/man/htick.1 -.include <bsd.port.mk> +.include "${MASTERDIR}/Makefile" diff --git a/news/husky-huskylib/Makefile b/news/husky-huskylib/Makefile index 646fac705721..8df055464560 100644 --- a/news/husky-huskylib/Makefile +++ b/news/husky-huskylib/Makefile @@ -1,9 +1,7 @@ # $FreeBSD$ PORTNAME= husky-huskylib -CATEGORIES= news mail -MAINTAINER= osharoiko@gmail.com COMMENT= Husky generic FTN library INSTALL_TARGET= install install-man @@ -12,4 +10,4 @@ USE_LDCONFIG= yes MASTERDIR= ${.CURDIR}/../husky COMPONENT_SUBDIR= huskylib -.include <bsd.port.mk> +.include "${MASTERDIR}/Makefile" diff --git a/news/husky-smapi/Makefile b/news/husky-smapi/Makefile index 1693b1a3f14b..69c4209606d9 100644 --- a/news/husky-smapi/Makefile +++ b/news/husky-smapi/Makefile @@ -1,9 +1,8 @@ # $FreeBSD$ PORTNAME= husky-smapi -CATEGORIES= news mail +PORTEPOCH= 1 -MAINTAINER= osharoiko@gmail.com COMMENT= Husky FTN MSGAPI library LIB_DEPENDS= libhusky.so:${PORTSDIR}/news/husky-huskylib @@ -13,4 +12,4 @@ USE_LDCONFIG= yes MASTERDIR= ${.CURDIR}/../husky COMPONENT_SUBDIR= smapi -.include <bsd.port.mk> +.include "${MASTERDIR}/Makefile" diff --git a/news/husky/Makefile b/news/husky/Makefile index e70cd3975d9a..4b9392d4e484 100644 --- a/news/husky/Makefile +++ b/news/husky/Makefile @@ -1,15 +1,38 @@ # $FreeBSD$ -PORTNAME= husky +PORTNAME?= husky +PORTVERSION= 1.9.20140519 +PORTREVISION?= 2 +PORTEPOCH?= 0 +CATEGORIES?= news mail +MASTER_SITES= SF/husky/husky/1.9-current/2014.05.19 -COMMENT= Husky full featured highly portable FTN Tosser +MAINTAINER?= osharoiko@gmail.com +COMMENT?= Husky full featured highly portable FTN Tosser +DISTNAME= husky-all-1.9-source-20140519 + +.if ${PORTNAME} == "husky" RUN_DEPENDS= hpt:${PORTSDIR}/news/husky-hpt \ htick:${PORTSDIR}/news/husky-htick -MASTERDIR= ${.CURDIR} - NO_BUILD= yes NO_INSTALL= yes +.endif + +USES+= alias gmake tar:tgz + +HUSKY_ROOTDIR= ${WRKDIR}/husky +PATCH_WRKSRC= ${HUSKY_ROOTDIR} +WRKSRC= ${HUSKY_ROOTDIR}/${COMPONENT_SUBDIR} +PKGDIR= ${.CURDIR} + +USERS= fido +GROUPS= fido + +pre-build: + ${LN} -sf ${HUSKY_ROOTDIR}/huskybse/huskymak.cfg ${HUSKY_ROOTDIR} + @${REINPLACE_CMD} -e 's|gcc|${CC}|; s|g++|${CXX}|' \ + ${HUSKY_ROOTDIR}/huskymak.cfg .include <bsd.port.mk> diff --git a/news/husky/Makefile.local b/news/husky/Makefile.local deleted file mode 100644 index a0c90a6802ea..000000000000 --- a/news/husky/Makefile.local +++ /dev/null @@ -1,32 +0,0 @@ -# vim:filetype=make -# $FreeBSD$ - -PORTVERSION= 1.9.20140519 -PORTREVISION= 2 -CATEGORIES= news mail - -.if ${PORTNAME} == "husky-smapi" -PORTEPOCH= 1 -.endif - -MAINTAINER= osharoiko@gmail.com - -MASTER_SITES= SF/husky/husky/1.9-current/2014.05.19 -DISTNAME= husky-all-1.9-source-20140519 - -HUSKY_ROOTDIR= ${WRKDIR}/husky -PATCH_WRKSRC= ${HUSKY_ROOTDIR} -WRKSRC= ${HUSKY_ROOTDIR}/${COMPONENT_SUBDIR} -PKGDIR= ${.CURDIR} - -CONFLICTS= ${PORTNAME}-[0-9]* - -USERS= fido -GROUPS= fido - -USES+= alias gmake tar:tgz - -pre-build: - ${LN} -sf ${HUSKY_ROOTDIR}/huskybse/huskymak.cfg ${HUSKY_ROOTDIR} - @${REINPLACE_CMD} -e 's|gcc|${CC}|; s|g++|${CXX}|' \ - ${HUSKY_ROOTDIR}/huskymak.cfg |