From 0996ebdf53b42668b10249ec0b25c3fdc9d74934 Mon Sep 17 00:00:00 2001
From: bapt <bapt@FreeBSD.org>
Date: Tue, 28 Jan 2014 21:47:19 +0000
Subject: Support stage Use options helpers Prevent configure from detecting
 emacs

---
 devel/idutils/Makefile  | 33 ++++++++++++---------------------
 devel/idutils/pkg-plist | 10 +++++++++-
 2 files changed, 21 insertions(+), 22 deletions(-)

(limited to 'devel')

diff --git a/devel/idutils/Makefile b/devel/idutils/Makefile
index 7529e0364521..abc4670bb008 100644
--- a/devel/idutils/Makefile
+++ b/devel/idutils/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	idutils
 PORTVERSION=	4.6
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	GNU
 
@@ -11,35 +12,25 @@ COMMENT=	The classic Berkeley gid/lid tools for looking up variables in code
 
 CONFLICTS=	coreutils-[0-9]* linux-gid-[0-9]* sh-utils-[0-9]*
 
-USES+=		charsetfix
 LICENSE=	GPLv3
+
+OPTIONS_DEFINE=	NLS
+
+USES=		charsetfix
 USE_XZ=		yes
 GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	EMACS='no'
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 INFO=		idutils
-MAN1=		aid.1 defid.1 eid.1 fid.1 fnid.1 gid.1 lid.1 mkid.1 xtokid.1
-
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-PLIST_SUB+=	NLS=""
-.else
-CONFIGURE_ARGS+=	--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
-
-# Port configure script will auto-install the .elc file if [x]emacs is found
-.if exists(${LOCALBASE}/bin/emacs) || exists(${LOCALBASE}/bin/xemacs)
-PLIST_SUB+=	ELC=""
-.else
-PLIST_SUB+=	ELC="@comment "
-.endif
+
+NLS_USES=	gettext
+NLS_CONFIGURE_ENABLE=	nls
+
+OPTIONS_SUB=	yes
 
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/lisp/idutils.el ${PREFIX}/share/emacs/site-lisp
+	${INSTALL_DATA} ${WRKSRC}/lisp/idutils.el ${STAGEDIR}${PREFIX}/share/emacs/site-lisp
 
 .include <bsd.port.mk>
diff --git a/devel/idutils/pkg-plist b/devel/idutils/pkg-plist
index 3bf3a6149eb6..812fa0549d71 100644
--- a/devel/idutils/pkg-plist
+++ b/devel/idutils/pkg-plist
@@ -7,8 +7,16 @@ bin/gid
 bin/lid
 bin/mkid
 bin/xtokid
+man/man1/aid.1.gz
+man/man1/defid.1.gz
+man/man1/eid.1.gz
+man/man1/fid.1.gz
+man/man1/fnid.1.gz
+man/man1/gid.1.gz
+man/man1/lid.1.gz
+man/man1/mkid.1.gz
+man/man1/xtokid.1.gz
 share/emacs/site-lisp/idutils.el
-%%ELC%%share/emacs/site-lisp/idutils.elc
 share/id-lang.map
 %%NLS%%share/locale/da/LC_MESSAGES/idutils.mo
 %%NLS%%share/locale/de/LC_MESSAGES/idutils.mo
-- 
cgit