staging mail/heirloom-mailx [for review]

Perry Hutchison perryh at pluto.rain.com
Tue Jun 3 07:41:29 UTC 2014


I noticed that mail/heirloom-mailx is no longer maintained, and has
not been staged.

It looks straightforward.  Did I miss anything?

--- Makefile	2014-05-31 21:58:23.000000000 -0700
+++ Makefile-staged	2014-06-03 00:34:03.000000000 -0700
@@ -8,7 +8,7 @@
 MASTER_SITES=	SF/heirloom/heirloom-${PORTNAME}/${PORTVERSION}
 PKGNAMEPREFIX=	heirloom-
 
-MAINTAINER=	ports at FreeBSD.org
+MAINTAINER=	perryh at pluto.rain.com
 COMMENT=	BSD mail utility with MIME, IMAP, POP3, SMTP, and S/MIME extensions
 
 OPTIONS_DEFINE=	IPV6 DOCS
@@ -25,10 +25,10 @@
 		CPPFLAGS="${CPPFLAGS}" \
 		LDFLAGS="${LDFLAGS}"
 
-MAN1=		${PORTNAME}.1
 PORTDOCS=	AUTHORS COPYING ChangeLog README TODO
 
 PLIST_FILES=	bin/${PORTNAME} \
+		man/man1/${PORTNAME}.1 \
 		"@unexec if cmp -s %D/etc/nail.rc %D/etc/nail.rc.default; then ${RM} -f %D/etc/nail.rc; fi " \
 		"etc/nail.rc.default" \
 		"@exec [ -f %B/nail.rc ] || ${CP} %B/%f %B/nail.rc"
@@ -36,7 +36,6 @@
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MIPV6}
@@ -44,16 +43,13 @@
 .endif
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/${MAN1} ${MAN1PREFIX}/man/man1
-	${INSTALL_DATA} ${WRKSRC}/nail.rc ${PREFIX}/etc/nail.rc.default
-.if !exists(${PREFIX}/etc/nail.rc)
-	${INSTALL_DATA} ${WRKSRC}/nail.rc ${PREFIX}/etc
-.endif
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
+	${INSTALL_DATA} ${WRKSRC}/nail.rc ${STAGEDIR}${PREFIX}/etc/nail.rc.default
 .if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
 .endfor
 .endif
 


More information about the freebsd-ports mailing list