- Support WITHOUT_NLS

- Support INFO
- Remove unnecessary BUILD_DEPENDS

PR:		ports/64854
Submitted by:	Ports Fury

4 files changed, 42 insertions, 22 deletions

diff --git a/devel/id-utils/Makefile b/devel/id-utils/Makefile
index a9fcf0ac54bd..07d8b9d35eaf 100644
--- a/devel/id-utils/Makefile
+++ b/devel/id-utils/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	id-utils
 PORTVERSION=	3.2d
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU_ALPHA}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,12 +15,26 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The classic Berkeley gid/lid tools for looking up variables in code
 
-# need to byte-compile a .el file
-BUILD_DEPENDS=	emacs:${PORTSDIR}/editors/emacs20
-
 CONFLICTS=	coreutils-* sh-utils-*
 
-GNU_CONFIGURE=	yes
+USE_REINPLACE=	yes
 USE_GMAKE=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+
+INFO=		id-utils
+
+.if defined(WITHOUT_NLS)
+CONFIGURE_ARGS+=	--disable-nls
+PLIST_SUB+=	NLS="@comment "
+.else
+USE_GETTEXT=	yes
+PLIST_SUB+=	NLS=""
+.endif
+
+post-patch:
+	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
+		's|@EMACS@|no|g'
 
 .include <bsd.port.mk>
diff --git a/devel/id-utils/pkg-plist b/devel/id-utils/pkg-plist
index 0e4b67d76c5d..6ae166ac0603 100644
--- a/devel/id-utils/pkg-plist
+++ b/devel/id-utils/pkg-plist
@@ -7,11 +7,7 @@ bin/gid
 bin/lid
 bin/mkid
 bin/xtokid
-@unexec install-info --delete %D/info/id-utils.info %D/info/dir
-info/id-utils.info
-@exec install-info %D/info/id-utils.info %D/info/dir
 share/emacs/site-lisp/id-utils.el
-share/emacs/site-lisp/id-utils.elc
 share/id-lang.map
-share/locale/de/LC_MESSAGES/id-utils.mo
-share/locale/fr/LC_MESSAGES/id-utils.mo
+%%NLS%%share/locale/de/LC_MESSAGES/id-utils.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/id-utils.mo
diff --git a/devel/idutils/Makefile b/devel/idutils/Makefile
index a9fcf0ac54bd..07d8b9d35eaf 100644
--- a/devel/idutils/Makefile
+++ b/devel/idutils/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	id-utils
 PORTVERSION=	3.2d
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU_ALPHA}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,12 +15,26 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The classic Berkeley gid/lid tools for looking up variables in code
 
-# need to byte-compile a .el file
-BUILD_DEPENDS=	emacs:${PORTSDIR}/editors/emacs20
-
 CONFLICTS=	coreutils-* sh-utils-*
 
-GNU_CONFIGURE=	yes
+USE_REINPLACE=	yes
 USE_GMAKE=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+
+INFO=		id-utils
+
+.if defined(WITHOUT_NLS)
+CONFIGURE_ARGS+=	--disable-nls
+PLIST_SUB+=	NLS="@comment "
+.else
+USE_GETTEXT=	yes
+PLIST_SUB+=	NLS=""
+.endif
+
+post-patch:
+	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
+		's|@EMACS@|no|g'
 
 .include <bsd.port.mk>
diff --git a/devel/idutils/pkg-plist b/devel/idutils/pkg-plist
index 0e4b67d76c5d..6ae166ac0603 100644
--- a/devel/idutils/pkg-plist
+++ b/devel/idutils/pkg-plist
@@ -7,11 +7,7 @@ bin/gid
 bin/lid
 bin/mkid
 bin/xtokid
-@unexec install-info --delete %D/info/id-utils.info %D/info/dir
-info/id-utils.info
-@exec install-info %D/info/id-utils.info %D/info/dir
 share/emacs/site-lisp/id-utils.el
-share/emacs/site-lisp/id-utils.elc
 share/id-lang.map
-share/locale/de/LC_MESSAGES/id-utils.mo
-share/locale/fr/LC_MESSAGES/id-utils.mo
+%%NLS%%share/locale/de/LC_MESSAGES/id-utils.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/id-utils.mo