From owner-svn-ports-all@FreeBSD.ORG  Sun Jun  1 14:39:33 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 834E2F77;
 Sun,  1 Jun 2014 14:39:33 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 56B1221B0;
 Sun,  1 Jun 2014 14:39:33 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s51EdXvx099723;
 Sun, 1 Jun 2014 14:39:33 GMT (envelope-from pawel@svn.freebsd.org)
Received: (from pawel@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s51EdXoc099721;
 Sun, 1 Jun 2014 14:39:33 GMT (envelope-from pawel@svn.freebsd.org)
Message-Id: <201406011439.s51EdXoc099721@svn.freebsd.org>
From: Pawel Pekala <pawel@FreeBSD.org>
Date: Sun, 1 Jun 2014 14:39:32 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r356128 - head/mail/abook
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 01 Jun 2014 14:39:33 -0000

Author: pawel
Date: Sun Jun  1 14:39:32 2014
New Revision: 356128
URL: http://svnweb.freebsd.org/changeset/ports/356128
QAT: https://qat.redports.org/buildarchive/r356128/

Log:
  - Add staging support
  - Remove leading article from COMMENT
  - Use options subs, helpers

Modified:
  head/mail/abook/Makefile
  head/mail/abook/pkg-plist

Modified: head/mail/abook/Makefile
==============================================================================
--- head/mail/abook/Makefile	Sun Jun  1 14:26:42 2014	(r356127)
+++ head/mail/abook/Makefile	Sun Jun  1 14:39:32 2014	(r356128)
@@ -8,38 +8,27 @@ CATEGORIES=	mail
 MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	An addressbook program with mutt mail client support
+COMMENT=	Addressbook program with mutt mail client support
 
 LICENSE=	GPLv2
 
-OPTIONS_DEFINE=	NLS DOCS
-
 USES=		ncurses readline
 GNU_CONFIGURE=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-MAN1=		abook.1
-MAN5=		abookrc.5
 PORTDOCS=	ANNOUNCE AUTHORS BUGS ChangeLog FAQ INSTALL NEWS README \
 		THANKS TODO
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
+OPTIONS_DEFINE=	NLS DOCS
+OPTIONS_SUB=	yes
 
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-PLIST_SUB+=	NLS=""
-.else
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
+NLS_CONFIGURE_ENABLE=	nls
+NLS_USES=		gettext
 
 post-install:
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
-.endif
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>

Modified: head/mail/abook/pkg-plist
==============================================================================
--- head/mail/abook/pkg-plist	Sun Jun  1 14:26:42 2014	(r356127)
+++ head/mail/abook/pkg-plist	Sun Jun  1 14:39:32 2014	(r356128)
@@ -1,4 +1,6 @@
 bin/abook
+man/man1/abook.1.gz
+man/man5/abookrc.5.gz
 %%NLS%%share/locale/de/LC_MESSAGES/abook.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/abook.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/abook.mo