Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 17 Oct 2013 06:11:40 +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: r330603 - in head/net/mcast-tools: . files
Message-ID:  <201310170611.r9H6BehZ068242@svn.freebsd.org>

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

Log:
  - Add STAGEDIR support.
  - Remove MAKE_JOBS_UNSAFE.
  - Take maintainership.

Added:
  head/net/mcast-tools/files/patch-mfc-Makefile.am   (contents, props changed)
  head/net/mcast-tools/files/patch-pim6sd-Makefile.am   (contents, props changed)
Modified:
  head/net/mcast-tools/Makefile
  head/net/mcast-tools/pkg-plist   (contents, props changed)

Modified: head/net/mcast-tools/Makefile
==============================================================================
--- head/net/mcast-tools/Makefile	Thu Oct 17 06:03:18 2013	(r330602)
+++ head/net/mcast-tools/Makefile	Thu Oct 17 06:11:39 2013	(r330603)
@@ -7,25 +7,17 @@ PORTREVISION=	1
 CATEGORIES=	net ipv6
 MASTER_SITES=	SF
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	IPv6 multicast routing daemons and tools
 
-MAKE_JOBS_UNSAFE=	yes
-
 GNU_CONFIGURE=	yes
 USE_AUTOTOOLS=	automake aclocal autoconf
 AUTOMAKE_ARGS=	--add-missing
-CONFIGURE_ARGS=
-CONFIGURE_ENV=
-
-MAN1=		mcastread.1 mcastsend.1 pim6stat.1 pmsft.1
-MAN5=		pim6dd.conf.5 pim6sd.conf.5
-MAN8=		mfc.8 mtrace6.8 pim6dd.8 pim6sd.8
+CONFIGURE_ARGS=	YACC=${YACC}
 
-NO_STAGE=	yes
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/pim6sd/pim6sd.conf.sample ${PREFIX}/etc
-	${INSTALL_DATA} ${FILESDIR}/pim6dd.conf.sample ${PREFIX}/etc
-	${INSTALL_DATA} ${WRKSRC}/mfc/mfc.conf.sample ${PREFIX}/etc
+	${INSTALL_DATA} ${WRKSRC}/pim6sd/pim6sd.conf.sample ${STAGEDIR}${PREFIX}/etc
+	${INSTALL_DATA} ${FILESDIR}/pim6dd.conf.sample ${STAGEDIR}${PREFIX}/etc
+	${INSTALL_DATA} ${WRKSRC}/mfc/mfc.conf.sample ${STAGEDIR}${PREFIX}/etc
 
 .include <bsd.port.mk>

Added: head/net/mcast-tools/files/patch-mfc-Makefile.am
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/mcast-tools/files/patch-mfc-Makefile.am	Thu Oct 17 06:11:39 2013	(r330603)
@@ -0,0 +1,29 @@
+--- mfc/Makefile.am.orig	2005-12-11 14:15:10.000000000 +0900
++++ mfc/Makefile.am	2013-10-17 13:52:36.000000000 +0900
+@@ -9,15 +9,19 @@
+ 
+ # Config file parser (this is necessary because not all yacc generate y.tab.h)
+ cftoken.o: cftoken.c cfparse.h
+-	$(COMPILE) -c -o $@ $<
++	$(COMPILE) -c -o $@ cftoken.c
+ 
+ cfparse.o: cfparse.c
+-	$(COMPILE) -c -o $@ $<
++	$(COMPILE) -c -o $@ $?
+ 
+ cftoken.c: cftoken.l
+-	$(LEX) -ocftoken.c $<
++	$(LEX) -o$@ $?
+ 
+-cfparse.h cfparse.c: cfparse.y
+-	$(YACC) -d $< && \
+-	mv y.tab.c cfparse.c && \
+-	mv y.tab.h cfparse.h
++y.tab.h y.tab.c: cfparse.y
++	$(YACC) -d $?
++
++cfparse.h: y.tab.h
++	mv y.tab.h $@
++
++cfparse.c: y.tab.c
++	mv y.tab.c $@

Added: head/net/mcast-tools/files/patch-pim6sd-Makefile.am
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/mcast-tools/files/patch-pim6sd-Makefile.am	Thu Oct 17 06:11:39 2013	(r330603)
@@ -0,0 +1,29 @@
+--- pim6sd/Makefile.am.orig	2005-12-11 14:15:12.000000000 +0900
++++ pim6sd/Makefile.am	2013-10-17 13:54:42.000000000 +0900
+@@ -12,15 +12,19 @@
+ 
+ # Config file parser (this is necessary because not all yacc generate y.tab.h)
+ cftoken.o: cftoken.c cfparse.h
+-	$(COMPILE) -c -o $@ $<
++	$(COMPILE) -c -o $@ cftoken.c
+ 
+ cfparse.o: cfparse.c
+-	$(COMPILE) -c -o $@ $<
++	$(COMPILE) -c -o $@ $?
+ 
+ cftoken.c: cftoken.l
+-	$(LEX) -ocftoken.c $<
++	$(LEX) -o$@ $?
+ 
+-cfparse.h cfparse.c: cfparse.y
+-	$(YACC) -d $< && \
+-	mv y.tab.c cfparse.c && \
+-	mv y.tab.h cfparse.h
++y.tab.c y.tab.h: cfparse.y
++	$(YACC) -d $?
++
++cfparse.h: y.tab.h
++	mv y.tab.h $@
++
++cfparse.c: y.tab.c
++	mv y.tab.c $@

Modified: head/net/mcast-tools/pkg-plist
==============================================================================
--- head/net/mcast-tools/pkg-plist	Thu Oct 17 06:03:18 2013	(r330602)
+++ head/net/mcast-tools/pkg-plist	Thu Oct 17 06:11:39 2013	(r330603)
@@ -1,3 +1,4 @@
+@comment $FreeBSD$
 etc/pim6sd.conf.sample
 etc/pim6dd.conf.sample
 etc/mfc.conf.sample
@@ -9,3 +10,13 @@ sbin/mfc
 sbin/pim6dd
 sbin/pim6sd
 sbin/pim6stat
+man/man1/mcastread.1.gz
+man/man1/mcastsend.1.gz
+man/man1/pim6stat.1.gz
+man/man1/pmsft.1.gz
+man/man5/pim6dd.conf.5.gz
+man/man5/pim6sd.conf.5.gz
+man/man8/mfc.8.gz
+man/man8/mtrace6.8.gz
+man/man8/pim6dd.8.gz
+man/man8/pim6sd.8.gz



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