Attachment #164111 for bug #202959

Lines 1-29 Link Here

(-)net/pimd/Makefile (-14 / +17 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= pimd	3	PORTNAME= pimd
4	PORTVERSION= 2.2.0	4	PORTVERSION= 2.3.1
5	CATEGORIES= net	5	CATEGORIES= net
6		6
7	MAINTAINER= olivier@cochard.me	7	MAINTAINER= olivier@cochard.me
8	COMMENT= Lightweight stand-alone PIM-SM v2 multicast routing daemon	8	COMMENT= Lightweight stand-alone PIM-SM v2 multicast routing daemon
9		9
10	LICENSE= BSD3CLAUSE	10	LICENSE= BSD3CLAUSE
		11	LICENSE_FILE= ${WRKSRC}/LICENSE
11		12
		13	USES= tar:bzip2
		14	USE_RC_SUBR= ${PORTNAME}
12	USE_GITHUB= yes	15	USE_GITHUB= yes
13	GH_ACCOUNT= troglobit	16	GH_ACCOUNT= troglobit
14		17	GH_PROJECT= ${PORTNAME} libite:libite
15	USES= tar:bzip2	18	GH_TAGNAME= ${PORTVERSION} v1.0.0:libite
16	HAS_CONFIGURE= yes	19	HAS_CONFIGURE= yes
		20	MAKE_ARGS+= prefix="${PREFIX}" sysconfdir="${PREFIX}/etc"
		21	PORTDOCS= AUTHORS CODE-OF-CONDUCT.md CONTRIBUTING.md CREDITS \
		22	ChangeLog.org FAQ.md INSTALL.md \
		23	README-config.md README-debug.md README.config.jp \
		24	README.md TODO.org
		25	OPTIONS_DEFINE= DOCS
		26	DOCS_INSTALL_TARGET= install install-docs
17		27
18	post-patch:	28	post-extract:
19	${REINPLACE_CMD} -e 's\|/etc/\|${PREFIX}/etc/\|g' ${WRKSRC}/pathnames.h	29	cd ${WRKSRC} && ${RMDIR} libite && \
		30	${LN} -s -f ${WRKDIR}/libite-1.0.0 libite
20		31
21	do-install:
22	${INSTALL_PROGRAM} ${WRKSRC}/pimd ${STAGEDIR}${PREFIX}/sbin/
23	${INSTALL_DATA} ${WRKSRC}/pimd.conf \
24	${STAGEDIR}${PREFIX}/etc/pimd.conf.sample
25	${INSTALL_SCRIPT} ${FILESDIR}/pimd.in \
26	${STAGEDIR}${PREFIX}/etc/rc.d/pimd
27	${INSTALL_MAN} ${WRKSRC}/pimd.8 ${STAGEDIR}${PREFIX}/man/man8/
28
29	.include <bsd.port.mk>	32	.include <bsd.port.mk>

Lines 1-2 Link Here

(-)net/pimd/distinfo (-2 / +4 lines)
1	SHA256 (troglobit-pimd-2.2.0_GH0.tar.bz2) = a6d969e235323852afdd1c9aebc15a2ff1e4da75e8277a736b3be9b2b484e30e	1	SHA256 (troglobit-pimd-2.3.1_GH0.tar.gz) = 24163fad4e6af3a4b1631de365bd4a7ffb0b3c7084bd999d0a35126a4d62f008
2	SIZE (troglobit-pimd-2.2.0_GH0.tar.bz2) = 223012	2	SIZE (troglobit-pimd-2.3.1_GH0.tar.gz) = 236563
		3	SHA256 (troglobit-libite-v1.0.0_GH0.tar.gz) = 11bcc47f08e69a5c659eb1d5fce2a4b0034f2fe3e19d2240d621bd80553cd8dc
		4	SIZE (troglobit-libite-v1.0.0_GH0.tar.gz) = 23080




--- Makefile.orig	2015-07-31 18:44:17.000000000 +0900
+++ Makefile	2015-08-28 14:24:27.932783000 +0900
@@ -35,25 +35,23 @@
 ## Common
 CPPFLAGS     += -D_PATH_SYSCONF=\"$(sysconfdir)\"
 CFLAGS       += $(INCLUDES) $(DEFS) $(USERCOMPILE)
-CFLAGS       += -W -Wall -Werror -fno-strict-aliasing
+#CFLAGS       += -W -Wall -Werror -fno-strict-aliasing
 LDLIBS        = $(EXTRA_LIBS)
 OBJS          = $(IGMP_OBJS) $(ROUTER_OBJS) $(PIM_OBJS) $(DVMRP_OBJS) $(EXTRA_OBJS)
 SRCS          = $(OBJS:.o=.c)
 MANS          = $(EXEC).8
 DISTFILES     = README.md README-config.md README.config.jp README-debug.md ChangeLog.org \
-		CONTRIBUTING.md CODE-OF-CONDUCT.md INSTALL.md LICENSE LICENSE.mrouted     \
+		CONTRIBUTING.md CODE-OF-CONDUCT.md INSTALL.md \
 		TODO.org CREDITS FAQ.md AUTHORS
 
 
 all: $(EXEC)
 
 .c.o:
-	@printf "  CC      $@\n"
-	@$(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
+	$(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
 
 $(EXEC): $(OBJS)
-	@printf "  LINK    $@\n"
-	@$(CC) $(CFLAGS) $(LDFLAGS) -Wl,-Map,$@.map -o $@ $(OBJS) $(LDLIBS)
+	$(CC) $(CFLAGS) $(LDFLAGS) -Wl,-Map,$@.map -o $@ $(OBJS) $(LDLIBS)
 
 vers.c:
 	@echo $(VERSION) | sed -e 's/.*/char todaysversion[]="&";/' > vers.c
@@ -61,15 +59,17 @@
 install: $(EXEC)
 	@install -d $(DESTDIR)$(prefix)/sbin
 	@install -d $(DESTDIR)$(sysconfdir)
-	@install -d $(DESTDIR)$(datadir)
 	@install -d $(DESTDIR)$(mandir)
-	@install -m 0755 $(EXEC) $(DESTDIR)$(prefix)/sbin/$(EXEC)
-	@install -b -m 0644 $(CONFIG) $(DESTDIR)$(sysconfdir)/$(CONFIG)
-	@for file in $(DISTFILES); do \
-		install -m 0644 $$file $(DESTDIR)$(datadir)/$$file; \
-	done
+	@${BSD_INSTALL_PROGRAM} $(EXEC) $(DESTDIR)$(prefix)/sbin/$(EXEC)
+	@${BSD_INSTALL_DATA} $(CONFIG) $(DESTDIR)$(sysconfdir)/$(CONFIG).sample
 	@for file in $(MANS); do \
-		install -m 0644 $$file $(DESTDIR)$(mandir)/$$file; \
+		${BSD_INSTALL_MAN} $$file $(DESTDIR)$(mandir)/$$file; \
+	done
+
+install-docs:
+	@install -d $(DESTDIR)$(datadir)
+	@for file in $(DISTFILES); do \
+		${BSD_INSTALL_DATA} $$file $(DESTDIR)$(datadir)/$$file; \
 	done
 
 uninstall:




--- libite/lite.h.orig	2015-08-28 14:04:00.533527000 +0900
+++ libite/lite.h	2015-08-28 14:04:32.198798000 +0900
@@ -25,7 +25,7 @@
 #ifndef FINIT_LITE_H_
 #define FINIT_LITE_H_
 
-#include <error.h>
+#include <err.h>
 #include <stdio.h>
 #include <stdint.h>    /* uint8_t, uint16_t, uint32_t, INT32_MAX, etc. */
 #include <string.h>
@@ -70,16 +70,16 @@
 #endif
 
 #ifndef touch
-# define touch(x) do { if (mknod((x), S_IFREG|0644, 0) && errno != EEXIST) error(0, errno, "Failed creating %s", x); } while (0)
+# define touch(x) do { if (mknod((x), S_IFREG|0644, 0) && errno != EEXIST) err(0, errno, "Failed creating %s", x); } while (0)
 #endif
 #ifndef makedir
-# define makedir(x, p) do { if (mkdir(x, p) && errno != EEXIST) error(0, errno, "Failed creating directory %s", x); } while (0)
+# define makedir(x, p) do { if (mkdir(x, p) && errno != EEXIST) err(0, errno, "Failed creating directory %s", x); } while (0)
 #endif
 #ifndef makefifo
-# define makefifo(x, p) do { if (mkfifo(x, p) && errno != EEXIST) error(0, errno, "Failed creating FIFO %s", x); } while (0)
+# define makefifo(x, p) do { if (mkfifo(x, p) && errno != EEXIST) err(0, errno, "Failed creating FIFO %s", x); } while (0)
 #endif
 #ifndef erase
-# define erase(x) do { if (remove(x) && errno != ENOENT) error(0, errno, "Failed removing %s", x); } while (0)
+# define erase(x) do { if (remove(x) && errno != ENOENT) err(0, errno, "Failed removing %s", x); } while (0)
 #endif
 #ifndef chardev
 # define chardev(x,m,maj,min) mknod((x), S_IFCHR|(m), makedev((maj),(min)))





. /etc/rc.subr

pimd_enable=${pimd_enable-"NO"}

name="pimd"
rcvar="${name}_enable"
command="%%PREFIX%%/sbin/${name}"
required_files="%%PREFIX%%/etc/${name}.conf"

extra_commands=reload

load_rc_config $name
: ${pimd_enable="NO"}
run_rc_command "$1"


Lines 1-4 Link Here

(-)net/pimd/pkg-plist (-2 / +1 lines)
1	@sample etc/pimd.conf.sample	1	@sample etc/pimd.conf.sample
2	etc/rc.d/pimd
3	sbin/pimd	2	sbin/pimd
4	man/man8/pimd.8.gz	3	share/man/man8/pimd.8

Return to bug 202959

Line 0 Link Here

(-)net/pimd/files/patch-Makefile (+57 lines)
	1	--- Makefile.orig 2015-07-31 18:44:17.000000000 +0900
	2	+++ Makefile 2015-08-28 14:24:27.932783000 +0900
	3	@@ -35,25 +35,23 @@
	4	## Common
	5	CPPFLAGS += -D_PATH_SYSCONF=\"$(sysconfdir)\"
	6	CFLAGS += $(INCLUDES) $(DEFS) $(USERCOMPILE)
	7	-CFLAGS += -W -Wall -Werror -fno-strict-aliasing
	8	+#CFLAGS += -W -Wall -Werror -fno-strict-aliasing
	9	LDLIBS = $(EXTRA_LIBS)
	10	OBJS = $(IGMP_OBJS) $(ROUTER_OBJS) $(PIM_OBJS) $(DVMRP_OBJS) $(EXTRA_OBJS)
	11	SRCS = $(OBJS:.o=.c)
	12	MANS = $(EXEC).8
	13	DISTFILES = README.md README-config.md README.config.jp README-debug.md ChangeLog.org \
	14	- CONTRIBUTING.md CODE-OF-CONDUCT.md INSTALL.md LICENSE LICENSE.mrouted \
	15	+ CONTRIBUTING.md CODE-OF-CONDUCT.md INSTALL.md \
	16	TODO.org CREDITS FAQ.md AUTHORS
	17
	18
	19	all: $(EXEC)
	20
	21	.c.o:
	22	- @printf " CC $@\n"
	23	- @$(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
	24	+ $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
	25
	26	$(EXEC): $(OBJS)
	27	- @printf " LINK $@\n"
	28	- @$(CC) $(CFLAGS) $(LDFLAGS) -Wl,-Map,$@.map -o $@ $(OBJS) $(LDLIBS)
	29	+ $(CC) $(CFLAGS) $(LDFLAGS) -Wl,-Map,$@.map -o $@ $(OBJS) $(LDLIBS)
	30
	31	vers.c:
	32	@echo $(VERSION) \| sed -e 's/.*/char todaysversion[]="&";/' > vers.c
	33	@@ -61,15 +59,17 @@
	34	install: $(EXEC)
	35	@install -d $(DESTDIR)$(prefix)/sbin
	36	@install -d $(DESTDIR)$(sysconfdir)
	37	- @install -d $(DESTDIR)$(datadir)
	38	@install -d $(DESTDIR)$(mandir)
	39	- @install -m 0755 $(EXEC) $(DESTDIR)$(prefix)/sbin/$(EXEC)
	40	- @install -b -m 0644 $(CONFIG) $(DESTDIR)$(sysconfdir)/$(CONFIG)
	41	- @for file in $(DISTFILES); do \
	42	- install -m 0644 $$file $(DESTDIR)$(datadir)/$$file; \
	43	- done
	44	+ @${BSD_INSTALL_PROGRAM} $(EXEC) $(DESTDIR)$(prefix)/sbin/$(EXEC)
	45	+ @${BSD_INSTALL_DATA} $(CONFIG) $(DESTDIR)$(sysconfdir)/$(CONFIG).sample
	46	@for file in $(MANS); do \
	47	- install -m 0644 $$file $(DESTDIR)$(mandir)/$$file; \
	48	+ ${BSD_INSTALL_MAN} $$file $(DESTDIR)$(mandir)/$$file; \
	49	+ done
	50	+
	51	+install-docs:
	52	+ @install -d $(DESTDIR)$(datadir)
	53	+ @for file in $(DISTFILES); do \
	54	+ ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(datadir)/$$file; \
	55	done
	56
	57	uninstall:

Line 0 Link Here

(-)net/pimd/files/patch-libite-lite.h (+32 lines)
	1	--- libite/lite.h.orig 2015-08-28 14:04:00.533527000 +0900
	2	+++ libite/lite.h 2015-08-28 14:04:32.198798000 +0900
	3	@@ -25,7 +25,7 @@
	4	#ifndef FINIT_LITE_H_
	5	#define FINIT_LITE_H_
	6
	7	-#include <error.h>
	8	+#include <err.h>
	9	#include <stdio.h>
	10	#include <stdint.h> /* uint8_t, uint16_t, uint32_t, INT32_MAX, etc. */
	11	#include <string.h>
	12	@@ -70,16 +70,16 @@
	13	#endif
	14
	15	#ifndef touch
	16	-# define touch(x) do { if (mknod((x), S_IFREG\|0644, 0) && errno != EEXIST) error(0, errno, "Failed creating %s", x); } while (0)
	17	+# define touch(x) do { if (mknod((x), S_IFREG\|0644, 0) && errno != EEXIST) err(0, errno, "Failed creating %s", x); } while (0)
	18	#endif
	19	#ifndef makedir
	20	-# define makedir(x, p) do { if (mkdir(x, p) && errno != EEXIST) error(0, errno, "Failed creating directory %s", x); } while (0)
	21	+# define makedir(x, p) do { if (mkdir(x, p) && errno != EEXIST) err(0, errno, "Failed creating directory %s", x); } while (0)
	22	#endif
	23	#ifndef makefifo
	24	-# define makefifo(x, p) do { if (mkfifo(x, p) && errno != EEXIST) error(0, errno, "Failed creating FIFO %s", x); } while (0)
	25	+# define makefifo(x, p) do { if (mkfifo(x, p) && errno != EEXIST) err(0, errno, "Failed creating FIFO %s", x); } while (0)
	26	#endif
	27	#ifndef erase
	28	-# define erase(x) do { if (remove(x) && errno != ENOENT) error(0, errno, "Failed removing %s", x); } while (0)
	29	+# define erase(x) do { if (remove(x) && errno != ENOENT) err(0, errno, "Failed removing %s", x); } while (0)
	30	#endif
	31	#ifndef chardev
	32	# define chardev(x,m,maj,min) mknod((x), S_IFCHR\|(m), makedev((maj),(min)))

Lines 12-26 Link Here

(-)net/pimd/files/pimd.in (-6 / +4 lines)
12		12
13	. /etc/rc.subr	13	. /etc/rc.subr
14		14
15	pimd_enable=${pimd_enable-"NO"}
16
17	name="pimd"	15	name="pimd"
18	rcvar=${name}_enable	16	rcvar="${name}_enable"
19		17	command="%%PREFIX%%/sbin/${name}"
20	command="/usr/local/sbin/${name}"	18	required_files="%%PREFIX%%/etc/${name}.conf"
21
22	extra_commands=reload	19	extra_commands=reload
23		20
24	load_rc_config $name	21	load_rc_config $name
		22	: ${pimd_enable="NO"}
25	run_rc_command "$1"	23	run_rc_command "$1"
26		24