Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 8 Jun 2014 13:19:06 +0000 (UTC)
From:      "Vanilla I. Shu" <vanilla@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r357014 - head/mail/heirloom-mailx
Message-ID:  <201406081319.s58DJ65K067823@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: vanilla
Date: Sun Jun  8 13:19:05 2014
New Revision: 357014
URL: http://svnweb.freebsd.org/changeset/ports/357014
QAT: https://qat.redports.org/buildarchive/r357014/

Log:
  1: Stagify.
  2: due pkg-plist changed, bump version.

Added:
  head/mail/heirloom-mailx/pkg-plist   (contents, props changed)
Modified:
  head/mail/heirloom-mailx/Makefile

Modified: head/mail/heirloom-mailx/Makefile
==============================================================================
--- head/mail/heirloom-mailx/Makefile	Sun Jun  8 13:14:42 2014	(r357013)
+++ head/mail/heirloom-mailx/Makefile	Sun Jun  8 13:19:05 2014	(r357014)
@@ -3,7 +3,7 @@
 
 PORTNAME=	mailx
 PORTVERSION=	12.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	mail ipv6
 MASTER_SITES=	SF/heirloom/heirloom-${PORTNAME}/${PORTVERSION}
 PKGNAMEPREFIX=	heirloom-
@@ -16,8 +16,7 @@ OPTIONS_DEFINE=	IPV6 DOCS
 CONFLICTS=	mailx-[0-9]*
 
 MAKE_JOBS_UNSAFE=	yes
-USE_BZIP2=	yes
-USES=		iconv
+USES=		iconv tar:bzip2
 USE_OPENSSL=	yes
 MAKE_ARGS=	PREFIX="${PREFIX}" \
 		SYSCONFDIR="${PREFIX}/etc" \
@@ -25,18 +24,11 @@ MAKE_ARGS=	PREFIX="${PREFIX}" \
 		CPPFLAGS="${CPPFLAGS}" \
 		LDFLAGS="${LDFLAGS}"
 
-MAN1=		${PORTNAME}.1
 PORTDOCS=	AUTHORS COPYING ChangeLog README TODO
 
-PLIST_FILES=	bin/${PORTNAME} \
-		"@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"
-
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MIPV6}
@@ -44,16 +36,13 @@ MAKE_ARGS+=	IPv6="-DHAVE_IPv6_FUNCS"
 .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.sample
 .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
 

Added: head/mail/heirloom-mailx/pkg-plist
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/mail/heirloom-mailx/pkg-plist	Sun Jun  8 13:19:05 2014	(r357014)
@@ -0,0 +1,3 @@
+bin/mailx
+@sample etc/nail.rc.sample
+man/man1/mailx.1.gz



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201406081319.s58DJ65K067823>