Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 15 Nov 2013 16:05:56 +0000 (UTC)
From:      "Vanilla I. Shu" <vanilla@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r333882 - in head/sysutils: no-login no-login/files npadmin nrg2iso
Message-ID:  <201311151605.rAFG5uT4075806@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: vanilla
Date: Fri Nov 15 16:05:56 2013
New Revision: 333882
URL: http://svnweb.freebsd.org/changeset/ports/333882

Log:
  Support STAGEDIR.

Added:
  head/sysutils/no-login/files/
  head/sysutils/no-login/files/patch-Makefile   (contents, props changed)
Modified:
  head/sysutils/no-login/Makefile
  head/sysutils/npadmin/Makefile
  head/sysutils/nrg2iso/Makefile

Modified: head/sysutils/no-login/Makefile
==============================================================================
--- head/sysutils/no-login/Makefile	Fri Nov 15 16:04:51 2013	(r333881)
+++ head/sysutils/no-login/Makefile	Fri Nov 15 16:05:56 2013	(r333882)
@@ -11,8 +11,6 @@ MASTER_SITE_SUBDIR=wes
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Refuse a login to a user, and make a note of it in syslog
 
-PLIST_FILES=	bin/nologin
-MAN8=		nologin.8
+PLIST_FILES=	bin/nologin man/man8/${PORTNAME}.8.gz
 
-NO_STAGE=	yes
 .include <bsd.port.mk>

Added: head/sysutils/no-login/files/patch-Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/no-login/files/patch-Makefile	Fri Nov 15 16:05:56 2013	(r333882)
@@ -0,0 +1,12 @@
+--- Makefile.orig	2013-11-15 23:27:54.000000000 +0800
++++ Makefile	2013-11-15 23:28:07.000000000 +0800
+@@ -30,7 +30,7 @@ all:		nologin
+ nologin:	nologin.c
+ 
+ install:
+-		install -c -o root -g bin -m 755 nologin $(PREFIX)/bin
+-		install -c -o root -g wheel -m 444 nologin.8 $(PREFIX)/man/man8
++		install -c -o root -g bin -m 755 nologin $(DESTDIR)$(PREFIX)/bin
++		install -c -o root -g wheel -m 444 nologin.8 $(DESTDIR)$(PREFIX)/man/man8
+ clean:
+ 		-rm -f *.o *~ nologin

Modified: head/sysutils/npadmin/Makefile
==============================================================================
--- head/sysutils/npadmin/Makefile	Fri Nov 15 16:04:51 2013	(r333881)
+++ head/sysutils/npadmin/Makefile	Fri Nov 15 16:05:56 2013	(r333882)
@@ -10,12 +10,10 @@ MASTER_SITES=	SF
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	SNMP based command line network printer management tool
 
-MAN1=		npadmin.1
-PLIST_FILES=	bin/npadmin
-
 GNU_CONFIGURE=	yes
 
-NO_STAGE=	yes
+PLIST_FILES=	bin/npadmin man/man1/${PORTNAME}.1.gz
+
 pre-configure:
 	${RM} ${WRKSRC}/getopt.h ${WRKSRC}/getopt1.c
 

Modified: head/sysutils/nrg2iso/Makefile
==============================================================================
--- head/sysutils/nrg2iso/Makefile	Fri Nov 15 16:04:51 2013	(r333881)
+++ head/sysutils/nrg2iso/Makefile	Fri Nov 15 16:05:56 2013	(r333882)
@@ -9,17 +9,16 @@ MASTER_SITES=	http://gregory.kokanosky.f
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Convert Nero .nrg CD-Image format to ISO
 
-USE_GMAKE=	yes
+USES=		gmake
 
 PLIST_FILES=	bin/nrg2iso
 
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -E \
 		-e 's|gcc|${CC} ${CFLAGS}|' \
 		${BUILD_WRKSRC}/${MAKEFILE}
 
 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/nrg2iso ${PREFIX}/bin
+	@${INSTALL_PROGRAM} ${WRKSRC}/nrg2iso ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>



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