Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 17 Oct 2013 04:01:01 +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: r330600 - in head/net/mrouted: . files
Message-ID:  <201310170401.r9H411Ax099050@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: hrs
Date: Thu Oct 17 04:01:01 2013
New Revision: 330600
URL: http://svnweb.freebsd.org/changeset/ports/330600

Log:
  Add STAGEDIR support.

Modified:
  head/net/mrouted/Makefile
  head/net/mrouted/files/patch-Makefile

Modified: head/net/mrouted/Makefile
==============================================================================
--- head/net/mrouted/Makefile	Thu Oct 17 03:41:22 2013	(r330599)
+++ head/net/mrouted/Makefile	Thu Oct 17 04:01:01 2013	(r330600)
@@ -18,16 +18,17 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 MAKE_ARGS=	sysconfdir=${PREFIX}/etc \
 		mandir=${MAN8PREFIX}/man/man8
-
-MAN8=		map-mbone.8 mrouted.8 mrinfo.8 mtrace.8
 PORTDOCS=	README AUTHORS ChangeLog
-
 PLIST_FILES=	sbin/map-mbone sbin/mrouted sbin/mrinfo sbin/mtrace \
-		etc/mrouted.conf
+		etc/mrouted.conf man/man8/map-mbone.8.gz \
+		man/man8/mrinfo.8.gz man/man8/mrouted.8.gz \
+		man/man8/mtrace.8.gz
+OPTIONS_DEFINE=	DOCS
+
+.include <bsd.port.options.mk>
 
-.ifdef	NOPORTDOCS
-MAKE_ARGS+=	datadir=${WRKDIR}/doc
+.if ${PORT_OPTIONS:MDOCS}
+MAKE_ARGS+=	datadir=${DOCSDIR} doc=yes
 .endif
 
-NO_STAGE=	yes
 .include <bsd.port.mk>

Modified: head/net/mrouted/files/patch-Makefile
==============================================================================
--- head/net/mrouted/files/patch-Makefile	Thu Oct 17 03:41:22 2013	(r330599)
+++ head/net/mrouted/files/patch-Makefile	Thu Oct 17 04:01:01 2013	(r330600)
@@ -1,5 +1,5 @@
---- Makefile.orig	2013-01-02 08:02:25.000000000 +0900
-+++ Makefile	2013-01-02 08:02:30.000000000 +0900
+--- Makefile.orig	2011-10-23 17:03:36.000000000 +0900
++++ Makefile	2013-10-17 12:59:19.000000000 +0900
 @@ -51,7 +51,7 @@
  		$(MTRACE_OBJS) $(MSTAT_OBJS)
  SRCS          = $(OBJS:.o=.c)
@@ -9,3 +9,19 @@
  
  LINT          = splint
  LINTFLAGS     = $(MCAST_INCLUDE) $(filter-out -W -Wall -Werror, $(CFLAGS)) -posix-lib -weak -skipposixheaders
+@@ -70,13 +70,13 @@
+ install: $(EXECS)
+ 	@install -d $(DESTDIR)$(prefix)/sbin
+ 	@install -d $(DESTDIR)$(sysconfdir)
+-	@install -d $(DESTDIR)$(datadir)
++	@[ -z "${doc}" ] || install -d $(DESTDIR)$(datadir)
+ 	@install -d $(DESTDIR)$(mandir)
+ 	@for file in $(EXECS); do \
+ 		install -m 0755 $$file $(DESTDIR)$(prefix)/sbin/$$file; \
+ 	done
+ 	@install -b -m 0644 $(CONFIG) $(DESTDIR)$(sysconfdir)/$(CONFIG)
+-	@for file in $(DISTFILES); do \
++	@[ -z "${doc}" ] || for file in $(DISTFILES); do \
+ 		install -m 0644 $$file $(DESTDIR)$(datadir)/$$file; \
+ 	done
+ 	@for file in $(MANS); do \



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