Date: Fri, 14 Apr 2006 00:59:52 -0700 (PDT) From: Alexander Botero-Lowry <alex@foxybanana.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/95730: [PATCH] net/bfilter: update to 0.10.3 Message-ID: <200604140759.k3E7xqwK077101@Laptop.mine.box> Resent-Message-ID: <200604140810.k3E8AHUM028144@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 95730
>Category: ports
>Synopsis: [PATCH] net/bfilter: update to 0.10.3
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Fri Apr 14 08:10:17 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Alexander Botero-Lowry
>Release: FreeBSD 6.0-STABLE i386
>Organization:
>Environment:
System: FreeBSD Laptop.mine.box 6.0-STABLE FreeBSD 6.0-STABLE #1: Tue Feb 7 19:06:16 PST
>Description:
- Update to 0.10.3
Added file(s):
- files/bfilter.sh.in
Removed file(s):
- files/bfilter.sh
Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
>Fix:
--- bfilter-0.10.3.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/net/bfilter/Makefile /usr/local/tinderbox/portstrees/FreeBSD/ports/net/bfilter/Makefile
--- /usr/ports/net/bfilter/Makefile Fri Sep 16 16:25:15 2005
+++ /usr/local/tinderbox/portstrees/FreeBSD/ports/net/bfilter/Makefile Fri Apr 14 00:32:35 2006
@@ -6,8 +6,7 @@
#
PORTNAME= bfilter
-PORTVERSION= 0.9.4
-PORTREVISION= 1
+PORTVERSION= 0.10.3
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -15,15 +14,14 @@
MAINTAINER= ports@FreeBSD.org
COMMENT= Smart filtering HTTP proxy
-LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt \
- tre.6:${PORTSDIR}/textproc/libtre \
- sigc-1.2.5:${PORTSDIR}/devel/libsigc++12
+LIB_DEPENDS= ACE.5:${PORTSDIR}/devel/ace \
+ sigc-2.0.0:${PORTSDIR}/devel/libsigc++20
GNU_CONFIGURE= yes
CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
-USE_RC_SUBR= yes
+USE_RC_SUBR= bfilter.sh
.if defined(WITH_DEBUG)
CONFIGURE_ARGS+= --enable-debug
@@ -37,36 +35,5 @@
.else
PLIST_SUB+= WITH_GUI="@comment "
.endif
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/main/bfilter ${PREFIX}/bin
-.if defined(WITH_GUI)
- ${INSTALL_PROGRAM} ${WRKSRC}/main/gui/gtk/bfilter-gui ${PREFIX}/bin
-.endif
- ${MKDIR} ${PREFIX}/etc/bfilter
- ${INSTALL_DATA} ${WRKSRC}/conf/config.default \
- ${PREFIX}/etc/bfilter/config.default
- ${INSTALL_DATA} ${WRKSRC}/conf/rules \
- ${PREFIX}/etc/bfilter/rules.sample
- ${INSTALL_DATA} ${WRKSRC}/conf/rules.local \
- ${PREFIX}/etc/bfilter/rules.local.sample
-
-post-install:
- ${INSTALL_SCRIPT} ${FILESDIR}/bfilter.sh ${PREFIX}/etc/rc.d
- @${ECHO_MSG} "-----------------------------------------------"
- @${ECHO_MSG} "Add bfilter_enable=\"YES\" to /etc/rc.conf to"
- @${ECHO_MSG} "enable bfilter."
- @${ECHO_MSG} "-----------------------------------------------"
- @${ECHO_MSG} "Sample configuration files placed in"
- @${ECHO_MSG} "${PREFIX}/etc/bfilter/config.default"
- @${ECHO_MSG} "${PREFIX}/etc/bfilter/rules.sample"
- @${ECHO_MSG} "${PREFIX}/etc/bfilter/rules.local.sample"
- @${ECHO_MSG} "-----------------------------------------------"
- @[ -f ${PREFIX}/etc/bfilter/config ] || \
- ${CP} ${PREFIX}/etc/bfilter/config.default ${PREFIX}/etc/bfilter/config
- @[ -f ${PREFIX}/etc/bfilter/rules ] || \
- ${CP} ${PREFIX}/etc/bfilter/rules.sample ${PREFIX}/etc/bfilter/rules
- @[ -f ${PREFIX}/etc/bfilter/rules.local ] || \
- ${CP} ${PREFIX}/etc/bfilter/rules.local.sample ${PREFIX}/etc/bfilter/rules.local
.include <bsd.port.mk>
diff -ruN --exclude=CVS /usr/ports/net/bfilter/distinfo /usr/local/tinderbox/portstrees/FreeBSD/ports/net/bfilter/distinfo
--- /usr/ports/net/bfilter/distinfo Sun Nov 27 22:45:19 2005
+++ /usr/local/tinderbox/portstrees/FreeBSD/ports/net/bfilter/distinfo Thu Apr 13 02:19:25 2006
@@ -1,3 +1,3 @@
-MD5 (bfilter-0.9.4.tar.gz) = 72ca85565bd4c556b06e3a264c0c24f1
-SHA256 (bfilter-0.9.4.tar.gz) = 4ff65e1e295f6236e1070648c8c2bba6557d838702dda6ece3187a32d427eed0
-SIZE (bfilter-0.9.4.tar.gz) = 1246053
+MD5 (bfilter-0.10.3.tar.gz) = fde0a7280819d061c36a283cf85e33c4
+SHA256 (bfilter-0.10.3.tar.gz) = 2941ef357a8882962713bc2c838c089ad756556a44a5dd5694963fb3d77e999b
+SIZE (bfilter-0.10.3.tar.gz) = 2555426
diff -ruN --exclude=CVS /usr/ports/net/bfilter/files/bfilter.sh /usr/local/tinderbox/portstrees/FreeBSD/ports/net/bfilter/files/bfilter.sh
--- /usr/ports/net/bfilter/files/bfilter.sh Sat Feb 25 19:13:30 2006
+++ /usr/local/tinderbox/portstrees/FreeBSD/ports/net/bfilter/files/bfilter.sh Wed Dec 31 16:00:00 1969
@@ -1,27 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD: ports/net/bfilter/files/bfilter.sh,v 1.2 2006/02/20 20:47:19 dougb Exp $
-#
-# PROVIDE: bfilter
-# REQUIRE: DAEMON
-#
-# Add the following line to /etc/rc.conf to enable bfilter:
-#
-# bfilter_enable="YES"
-#
-
-bfilter_enable=${bfilter_enable-"NO"}
-bfilter_flags=${bfilter_flags-"-c /usr/local/etc/bfilter"}
-
-. /etc/rc.subr
-
-load_rc_config bfilter
-
-name=bfilter
-rcvar=`set_rcvar`
-
-command=/usr/local/bin/${name}
-sig_stop=-KILL
-
-load_rc_config ${name}
-run_rc_command "$1"
diff -ruN --exclude=CVS /usr/ports/net/bfilter/files/bfilter.sh.in /usr/local/tinderbox/portstrees/FreeBSD/ports/net/bfilter/files/bfilter.sh.in
--- /usr/ports/net/bfilter/files/bfilter.sh.in Wed Dec 31 16:00:00 1969
+++ /usr/local/tinderbox/portstrees/FreeBSD/ports/net/bfilter/files/bfilter.sh.in Thu Apr 13 02:18:27 2006
@@ -0,0 +1,27 @@
+#!/bin/sh
+#
+# $FreeBSD: ports/net/bfilter/files/bfilter.sh,v 1.2 2006/02/20 20:47:19 dougb Exp $
+#
+# PROVIDE: bfilter
+# REQUIRE: DAEMON
+#
+# Add the following line to /etc/rc.conf to enable bfilter:
+#
+# bfilter_enable="YES"
+#
+
+bfilter_enable=${bfilter_enable-"NO"}
+bfilter_flags=${bfilter_flags-"-c %%PREFIX%%/etc/bfilter"}
+
+. %%RC_SUBR%%
+
+load_rc_config bfilter
+
+name=bfilter
+rcvar=`set_rcvar`
+
+command=%%PREFIX%%/bin/${name}
+sig_stop=-KILL
+
+load_rc_config ${name}
+run_rc_command "$1"
diff -ruN --exclude=CVS /usr/ports/net/bfilter/pkg-plist /usr/local/tinderbox/portstrees/FreeBSD/ports/net/bfilter/pkg-plist
--- /usr/ports/net/bfilter/pkg-plist Fri Aug 27 12:21:34 2004
+++ /usr/local/tinderbox/portstrees/FreeBSD/ports/net/bfilter/pkg-plist Fri Apr 14 00:49:07 2006
@@ -1,13 +1,11 @@
bin/bfilter
etc/rc.d/bfilter.sh
-%%WITH_GUI%%bin/bfilter-gui
-@unexec if cmp -s %D/etc/bfilter/config %D/etc/bfilter/config.default; then rm -f %D/etc/bfilter/config; fi
etc/bfilter/config.default
-@exec [ -f %B/config ] || cp %B/%f %B/config
-@unexec if cmp -s %D/etc/bfilter/rules %D/etc/bfilter/rules.sample; then rm -f %D/etc/bfilter/rules; fi
-etc/bfilter/rules.sample
-@exec [ -f %B/rules ] || cp %B/%f %B/rules
-@unexec if cmp -s %D/etc/bfilter/rules.local %D/etc/bfilter/rules.local.sample; then rm -f %D/etc/bfilter/rules.local; fi
-etc/bfilter/rules.local.sample
-@exec [ -f %B/rules.local ] || cp %B/%f %B/rules.local
-@unexec rmdir %B 2>/dev/null || true
+etc/bfilter/urls
+etc/bfilter/filters/PopUp filter
+etc/bfilter/filters/Common annoyances filter
+etc/bfilter/config
+etc/bfilter/urls.local
+%%WITH_GUI%%bin/bfilter-gui
+@dirrm etc/bfilter/filters
+@dirrm etc/bfilter
--- bfilter-0.10.3.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200604140759.k3E7xqwK077101>