- Update to 0.10.3

PR:		ports/95730
Submitted by:	Alexander Botero-Lowry <alex@foxybanana.com>

4 files changed, 18 insertions, 54 deletions

diff --git a/net/bfilter/Makefile b/net/bfilter/Makefile
index 7c4077a59a4f..53fc8d266ee0 100644
--- a/net/bfilter/Makefile
+++ b/net/bfilter/Makefile
@@ -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 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 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
@@ -38,35 +36,4 @@ PLIST_SUB+=	WITH_GUI=""
 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 --git a/net/bfilter/distinfo b/net/bfilter/distinfo
index 48bdf7eac677..c9e909007c0e 100644
--- a/net/bfilter/distinfo
+++ b/net/bfilter/distinfo
@@ -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 --git a/net/bfilter/files/bfilter.sh b/net/bfilter/files/bfilter.sh.in
index 20ffc4d1af23..5ae1b47a7f27 100644
--- a/net/bfilter/files/bfilter.sh
+++ b/net/bfilter/files/bfilter.sh.in
@@ -11,16 +11,16 @@
 #
 
 bfilter_enable=${bfilter_enable-"NO"}
-bfilter_flags=${bfilter_flags-"-c /usr/local/etc/bfilter"}
+bfilter_flags=${bfilter_flags-"-c %%PREFIX%%/etc/bfilter"}
 
-. /etc/rc.subr
+. %%RC_SUBR%%
 
 load_rc_config bfilter
 
 name=bfilter
 rcvar=`set_rcvar`
 
-command=/usr/local/bin/${name}
+command=%%PREFIX%%/bin/${name}
 sig_stop=-KILL
 
 load_rc_config ${name}
diff --git a/net/bfilter/pkg-plist b/net/bfilter/pkg-plist
index d1b3fbc4d6ae..8edcfd9166c7 100644
--- a/net/bfilter/pkg-plist
+++ b/net/bfilter/pkg-plist
@@ -1,13 +1,10 @@
 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