Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 28 Jan 2014 21:47:19 +0000 (UTC)
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r341661 - head/devel/idutils
Message-ID:  <201401282147.s0SLlJvP089535@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bapt
Date: Tue Jan 28 21:47:19 2014
New Revision: 341661
URL: http://svnweb.freebsd.org/changeset/ports/341661
QAT: https://qat.redports.org/buildarchive/r341661/

Log:
  Support stage
  Use options helpers
  Prevent configure from detecting emacs

Modified:
  head/devel/idutils/Makefile
  head/devel/idutils/pkg-plist

Modified: head/devel/idutils/Makefile
==============================================================================
--- head/devel/idutils/Makefile	Tue Jan 28 21:35:29 2014	(r341660)
+++ head/devel/idutils/Makefile	Tue Jan 28 21:47:19 2014	(r341661)
@@ -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 to
 
 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>
+NLS_USES=	gettext
+NLS_CONFIGURE_ENABLE=	nls
 
-.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
+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>

Modified: head/devel/idutils/pkg-plist
==============================================================================
--- head/devel/idutils/pkg-plist	Tue Jan 28 21:35:29 2014	(r341660)
+++ head/devel/idutils/pkg-plist	Tue Jan 28 21:47:19 2014	(r341661)
@@ -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



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