Date: Sat, 11 Oct 2014 14:24:05 +0000 (UTC) From: Kurt Jaeger <pi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r370646 - in head/net/igmpproxy: . files Message-ID: <201410111424.s9BEO5lH096919@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pi Date: Sat Oct 11 14:24:05 2014 New Revision: 370646 URL: https://svnweb.freebsd.org/changeset/ports/370646 QAT: https://qat.redports.org/buildarchive/r370646/ Log: net/igmpproxy: fix issue with changes to struct ip for fbsd 9/10 PR: 188986 Submitted by: yuri@rivera.ru Approved by: melifaro@ipfw.ru (maintainer timeout) Added: head/net/igmpproxy/files/patch-Makefile.in (contents, props changed) head/net/igmpproxy/files/patch-src__os-freebsd.h (contents, props changed) Deleted: head/net/igmpproxy/files/patch-Makefile Modified: head/net/igmpproxy/Makefile head/net/igmpproxy/pkg-plist Modified: head/net/igmpproxy/Makefile ============================================================================== --- head/net/igmpproxy/Makefile Sat Oct 11 14:01:18 2014 (r370645) +++ head/net/igmpproxy/Makefile Sat Oct 11 14:24:05 2014 (r370646) @@ -3,7 +3,7 @@ PORTNAME= igmpproxy PORTVERSION= 0.1 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} Added: head/net/igmpproxy/files/patch-Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/igmpproxy/files/patch-Makefile.in Sat Oct 11 14:24:05 2014 (r370646) @@ -0,0 +1,14 @@ +--- Makefile.in.orig 2009-10-05 18:19:42 UTC ++++ Makefile.in +@@ -284,7 +284,10 @@ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(sysconfdir)'"; \ +- $(INSTALL_DATA) $$files "$(DESTDIR)$(sysconfdir)" || exit $$?; \ ++ if [ ! -f "$(DESTDIR)$(sysconfdir)/$$files" ]; then \ ++ $(INSTALL_DATA) $$files "$(DESTDIR)$(sysconfdir)" || exit $$?; \ ++ fi; \ ++ $(INSTALL_DATA) $$files "$(DESTDIR)$(sysconfdir)/$$files.sample" || exit $$?; \ + done + + uninstall-dist_sysconfDATA: Added: head/net/igmpproxy/files/patch-src__os-freebsd.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/igmpproxy/files/patch-src__os-freebsd.h Sat Oct 11 14:24:05 2014 (r370646) @@ -0,0 +1,14 @@ +--- src/os-freebsd.h.orig 2014-10-11 14:15:20 UTC ++++ src/os-freebsd.h +@@ -14,7 +14,11 @@ + + static inline u_short ip_data_len(const struct ip *ip) + { ++#if __FreeBSD_version >= 900044 ++ return ip->ip_len - (ip->ip_hl << 2); ++#else + return ip->ip_len; ++#endif + } + + static inline void ip_set_len(struct ip *ip, u_short len) Modified: head/net/igmpproxy/pkg-plist ============================================================================== --- head/net/igmpproxy/pkg-plist Sat Oct 11 14:01:18 2014 (r370645) +++ head/net/igmpproxy/pkg-plist Sat Oct 11 14:24:05 2014 (r370646) @@ -1,6 +1,4 @@ sbin/igmpproxy -@unexec if cmp -s %D/etc/igmpproxy.conf.sample %D/etc/igmpproxy.conf; then rm -f %D/etc/igmpproxy.conf; fi -etc/igmpproxy.conf.sample -@exec if [ ! -f %D/etc/igmpproxy.conf ]; then cp -p %D/%F %B/igmpproxy.conf; fi +@sample etc/igmpproxy.conf.sample man/man5/igmpproxy.conf.5.gz man/man8/igmpproxy.8.gz
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201410111424.s9BEO5lH096919>