From owner-svn-ports-all@FreeBSD.ORG  Mon Feb 25 04:25:38 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id E4E8FDC3;
 Mon, 25 Feb 2013 04:25:38 +0000 (UTC)
 (envelope-from pclin@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id B506CC06;
 Mon, 25 Feb 2013 04:25:38 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1P4Pcls020380;
 Mon, 25 Feb 2013 04:25:38 GMT (envelope-from pclin@svn.freebsd.org)
Received: (from pclin@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1P4Pc9u020378;
 Mon, 25 Feb 2013 04:25:38 GMT (envelope-from pclin@svn.freebsd.org)
Message-Id: <201302250425.r1P4Pc9u020378@svn.freebsd.org>
From: Po-Chien Lin <pclin@FreeBSD.org>
Date: Mon, 25 Feb 2013 04:25:38 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r312904 - head/net-im/imspector
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 25 Feb 2013 04:25:39 -0000

Author: pclin
Date: Mon Feb 25 04:25:37 2013
New Revision: 312904
URL: http://svnweb.freebsd.org/changeset/ports/312904

Log:
  - Add IPFW suuport [1] and enable it by default [2]
  - Trim Makefile header [2]
  - Remove invalid entry from MASTER_SITES
  - Patch to fix clang compiling
  - Tune pkg-plist to pet portlint(1)
  
  PR:		ports/175765
  Submitted by:	Oleg_Sch <7zsfx@7zsfx.info> [1]
  Approved by:	Mikhail Tsatsenko <m.tsatsenko@gmail.com> (maintainer) [2]
  Approved by:	swills (mentor)

Modified:
  head/net-im/imspector/Makefile
  head/net-im/imspector/pkg-plist

Modified: head/net-im/imspector/Makefile
==============================================================================
--- head/net-im/imspector/Makefile	Mon Feb 25 04:12:49 2013	(r312903)
+++ head/net-im/imspector/Makefile	Mon Feb 25 04:25:37 2013	(r312904)
@@ -1,15 +1,11 @@
-# New ports collection makefile for:   	imspector
-# Date created:        			17 March 2008
-# Whom:            			Ilja Dejs <ilja.dejs@gmail.com>
-#
+# Created by: Ilja Dejs <ilja.dejs@gmail.com>
 # $FreeBSD$
-#
 
 PORTNAME=	imspector
 PORTVERSION=	20111108
+PORTREVISION=	1
 CATEGORIES=	net-im
-MASTER_SITES=	http://www.imspector.org/downloads/ \
-		http://tsatsenko.ru/ports/distfiles/
+MASTER_SITES=	http://tsatsenko.ru/ports/distfiles/
 
 MAINTAINER=	m.tsatsenko@gmail.com
 COMMENT=	IM transparent proxy with monitoring, blocking, and content-filtering
@@ -28,12 +24,26 @@ USE_RC_SUBR=	${PORTNAME}
 
 MAKE_ENV+=	ETCDIR=${ETCDIR}
 
+OPTIONS_DEFINE=	IPFW
+OPTIONS_DEFAULT=	IPFW
+IPFW_DESC=	Add IPFW support
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MIPFW}
+CFLAGS+=	-DIPFW_TRANSPARENT=1
+.endif
+
 post-extract:
-	${MV}	${WRKDIR}/${PORTNAME} ${WRKSRC}
+	${MV} ${WRKDIR}/${PORTNAME} ${WRKSRC}
+
 post-patch:
 	@${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},g' \
 		${WRKSRC}/imspector.conf \
 		${WRKSRC}/main.cpp
+	@${REINPLACE_CMD} -e 's,= SSLv23_method(),= (SSL_METHOD *) SSLv23_method(),g' \
+		${WRKSRC}/sslstate.cpp
+
 post-install:
 .for f in ${CONFIG_FILES}
 	@if [ ! -f ${ETCDIR}/${f} ]; then \

Modified: head/net-im/imspector/pkg-plist
==============================================================================
--- head/net-im/imspector/pkg-plist	Mon Feb 25 04:12:49 2013	(r312903)
+++ head/net-im/imspector/pkg-plist	Mon Feb 25 04:25:37 2013	(r312904)
@@ -27,5 +27,6 @@ lib/libimspector.so
 sbin/imspector
 @dirrmtry %%ETCDIR%%
 @dirrm lib/imspector
-@unexec rmdir /var/lib/imspector 2>/dev/null || true
-@unexec rmdir /var/log/imspector 2>/dev/null || true
+@cwd /var
+@dirrmtry %D/lib/imspector
+@dirrmtry %D/log/imspector