Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 26 Nov 2013 15:07:23 +0000 (UTC)
From:      Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r334943 - head/sysutils/psmisc
Message-ID:  <201311261507.rAQF7NK3014105@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: sunpoet
Date: Tue Nov 26 15:07:23 2013
New Revision: 334943
URL: http://svnweb.freebsd.org/changeset/ports/334943

Log:
  - Support STAGEDIR
  - While I'm here:
    - Convert to new options helper
    - Use USES=gmake
  
  PR:		ports/184275
  Submitted by:	Douglas William Thrift <douglas@douglasthrift.net> (maintainer)

Modified:
  head/sysutils/psmisc/Makefile
  head/sysutils/psmisc/pkg-plist   (contents, props changed)

Modified: head/sysutils/psmisc/Makefile
==============================================================================
--- head/sysutils/psmisc/Makefile	Tue Nov 26 15:07:16 2013	(r334942)
+++ head/sysutils/psmisc/Makefile	Tue Nov 26 15:07:23 2013	(r334943)
@@ -16,28 +16,17 @@ BUILD_DEPENDS=	gsed:${PORTSDIR}/textproc
 CONFLICTS=	pidof-[0-9]* pstree-2.[0-9]*
 
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USES=		gmake
 
 OPTIONS_DEFINE=	NLS
-
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
-MAN1=		killall.1 pstree.1
-
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-CONFIGURE_ARGS=	--enable-nls
-PLIST_SUB+=	NLS=""
-.else
-CONFIGURE_ARGS=	--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
+OPTIONS_SUB=	yes
+NLS_CONFIGURE_ENABLE=	nls
+NLS_USES=		gettext
 
 post-patch:
 	@${REINPLACE_CMD} -e '/^#define COMM_LEN / s|16|254|' ${WRKSRC}/src/comm.h
 
 post-install:
-	@${LN} -fs ${PREFIX}/bin/killall ${PREFIX}/bin/pidof
+	@${LN} -fs killall ${STAGEDIR}${PREFIX}/bin/pidof
 
 .include <bsd.port.mk>

Modified: head/sysutils/psmisc/pkg-plist
==============================================================================
--- head/sysutils/psmisc/pkg-plist	Tue Nov 26 15:07:16 2013	(r334942)
+++ head/sysutils/psmisc/pkg-plist	Tue Nov 26 15:07:23 2013	(r334943)
@@ -1,8 +1,9 @@
-@comment $FreeBSD$
 bin/killall
 bin/pidof
 bin/pstree
 bin/pstree.x11
+man/man1/killall.1.gz
+man/man1/pstree.1.gz
 %%NLS%%share/locale/bg/LC_MESSAGES/psmisc.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/psmisc.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/psmisc.mo



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