Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 16 Oct 2013 21:26:50 +0000 (UTC)
From:      Hiroki Sato <hrs@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r330545 - in head/net/dhcp6: . files
Message-ID:  <201310162126.r9GLQoi0086053@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: hrs
Date: Wed Oct 16 21:26:50 2013
New Revision: 330545
URL: http://svnweb.freebsd.org/changeset/ports/330545

Log:
  Add STAGEDIR support.

Added:
  head/net/dhcp6/files/patch-Makefile.in   (contents, props changed)
Modified:
  head/net/dhcp6/Makefile
  head/net/dhcp6/pkg-plist   (contents, props changed)

Modified: head/net/dhcp6/Makefile
==============================================================================
--- head/net/dhcp6/Makefile	Wed Oct 16 21:19:39 2013	(r330544)
+++ head/net/dhcp6/Makefile	Wed Oct 16 21:26:50 2013	(r330545)
@@ -15,25 +15,24 @@ LICENSE=	BSD
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--sysconfdir=${LOCALBASE}/etc --with-localdbdir=/var/db
+GNU_CONFIGURE_PREFIX=	${STAGEDIR}${PREFIX}
+MANPREFIX=	${STAGEDIR}${PREFIX}
+CONFIGURE_ARGS=	--sysconfdir=${LOCALBASE}/etc \
+		--with-localdbdir=/var/db
 USE_RC_SUBR=	dhcp6c dhcp6relay dhcp6s
 PORTDOCS=	README
 
 OPTIONS_DEFINE=	DOCS
 
-MAN5=		dhcp6c.conf.5 dhcp6s.conf.5
-MAN8=		dhcp6c.8 dhcp6s.8 dhcp6relay.8 dhcp6ctl.8
-
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 post-install:
 	cd ${WRKSRC} && ${INSTALL_DATA} \
-		dhcp6c.conf.sample dhcp6s.conf.sample \
-		${PREFIX}/etc
+	    dhcp6c.conf.sample dhcp6s.conf.sample \
+	    ${STAGEDIR}${PREFIX}/etc
 .if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>

Added: head/net/dhcp6/files/patch-Makefile.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/dhcp6/files/patch-Makefile.in	Wed Oct 16 21:26:50 2013	(r330545)
@@ -0,0 +1,23 @@
+--- Makefile.in.orig	2013-10-17 05:40:19.000000000 +0900
++++ Makefile.in	2013-10-17 05:40:57.000000000 +0900
+@@ -103,13 +103,13 @@
+ 
+ install::
+ 	-mkdir -p $(sbindir) $(mandir)/man5 $(mandir)/man8
+-	$(INSTALL_PROGRAM) -s -o $(user) -g $(group) $(TARGET) $(sbindir)
+-	$(INSTALL_DATA) -o $(user) -g $(group) dhcp6c.8 $(mandir)/man8
+-	$(INSTALL_DATA) -o $(user) -g $(group) dhcp6s.8 $(mandir)/man8
+-	$(INSTALL_DATA) -o $(user) -g $(group) dhcp6relay.8 $(mandir)/man8
+-	$(INSTALL_DATA) -o $(user) -g $(group) dhcp6ctl.8 $(mandir)/man8
+-	$(INSTALL_DATA) -o $(user) -g $(group) dhcp6c.conf.5 $(mandir)/man5
+-	$(INSTALL_DATA) -o $(user) -g $(group) dhcp6s.conf.5 $(mandir)/man5
++	$(INSTALL_PROGRAM) $(TARGET) $(sbindir)
++	$(INSTALL_DATA) dhcp6c.8 $(mandir)/man8
++	$(INSTALL_DATA) dhcp6s.8 $(mandir)/man8
++	$(INSTALL_DATA) dhcp6relay.8 $(mandir)/man8
++	$(INSTALL_DATA) dhcp6ctl.8 $(mandir)/man8
++	$(INSTALL_DATA) dhcp6c.conf.5 $(mandir)/man5
++	$(INSTALL_DATA) dhcp6s.conf.5 $(mandir)/man5
+ 
+ includes::
+ 

Modified: head/net/dhcp6/pkg-plist
==============================================================================
--- head/net/dhcp6/pkg-plist	Wed Oct 16 21:19:39 2013	(r330544)
+++ head/net/dhcp6/pkg-plist	Wed Oct 16 21:26:50 2013	(r330545)
@@ -11,3 +11,9 @@ sbin/dhcp6c
 sbin/dhcp6relay
 sbin/dhcp6s
 sbin/dhcp6ctl
+man/man5/dhcp6c.conf.5
+man/man5/dhcp6s.conf.5
+man/man8/dhcp6c.8
+man/man8/dhcp6ctl.8
+man/man8/dhcp6relay.8
+man/man8/dhcp6s.8



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