- Add staging support

- Remove leading article from COMMENT
- Use options subs, helpers

2 files changed, 9 insertions, 18 deletions

diff --git a/mail/abook/Makefile b/mail/abook/Makefile
index 1a866941680e..511e8ac88bd5 100644
--- a/mail/abook/Makefile
+++ b/mail/abook/Makefile
@@ -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>
diff --git a/mail/abook/pkg-plist b/mail/abook/pkg-plist
index 6b1f15121cf9..16aeac9a9e5e 100644
--- a/mail/abook/pkg-plist
+++ b/mail/abook/pkg-plist
@@ -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