From owner-svn-ports-head@FreeBSD.ORG Wed Feb 19 14:52:33 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C95191F8; Wed, 19 Feb 2014 14:52:33 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id B571F1DD4; Wed, 19 Feb 2014 14:52:33 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1JEqXVF081464; Wed, 19 Feb 2014 14:52:33 GMT (envelope-from garga@svn.freebsd.org) Received: (from garga@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1JEqX8D081461; Wed, 19 Feb 2014 14:52:33 GMT (envelope-from garga@svn.freebsd.org) Message-Id: <201402191452.s1JEqX8D081461@svn.freebsd.org> From: Renato Botelho Date: Wed, 19 Feb 2014 14:52:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r345098 - in head/net-im/imspector: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Feb 2014 14:52:33 -0000 Author: garga Date: Wed Feb 19 14:52:32 2014 New Revision: 345098 URL: http://svnweb.freebsd.org/changeset/ports/345098 QAT: https://qat.redports.org/buildarchive/r345098/ Log: - Replace USE_GMAKE by USES=gmake - Use OPTIONS helpers - Support staging - Pet portlint - Add a new option, off by default, to build PLUGINS PR: ports/186687 Approved by: Mikhail Tsatsenko (maintainer) Modified: head/net-im/imspector/Makefile head/net-im/imspector/files/patch-Makefile head/net-im/imspector/pkg-plist Modified: head/net-im/imspector/Makefile ============================================================================== --- head/net-im/imspector/Makefile Wed Feb 19 14:45:19 2014 (r345097) +++ head/net-im/imspector/Makefile Wed Feb 19 14:52:32 2014 (r345098) @@ -13,8 +13,7 @@ COMMENT= IM transparent proxy with monit LICENSE= GPLv2 CFLAGS+= -fPIC -I ${LOCALBASE}/include -DHAVE_SSL -USE_GMAKE= YES -USES= iconv +USES= iconv gmake USE_OPENSSL= YES USE_LDCONFIG= ${LOCALBASE}/lib/imspector @@ -24,19 +23,20 @@ USE_RC_SUBR= ${PORTNAME} MAKE_ENV+= ETCDIR=${ETCDIR} -OPTIONS_DEFINE= IPFW -OPTIONS_DEFAULT= IPFW +OPTIONS_DEFINE= IPFW PLUGINS +OPTIONS_DEFAULT=IPFW +OPTIONS_SUB= yes + IPFW_DESC= Add IPFW support +PLUGINS_DESC= Build plugins -NO_STAGE= yes -.include +IPFW_CFLAGS= -DIPFW_TRANSPARENT=1 +PLUGINS_USE= MYSQL=yes SQLITE=yes PGSQL=yes -.if ${PORT_OPTIONS:MIPFW} -CFLAGS+= -DIPFW_TRANSPARENT=1 -.endif +.include post-extract: - ${MV} ${WRKDIR}/${PORTNAME} ${WRKSRC} + @${MV} ${WRKDIR}/${PORTNAME} ${WRKSRC} post-patch: @${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},g' \ @@ -46,12 +46,9 @@ post-patch: ${WRKSRC}/sslstate.cpp @${REINPLACE_CMD} -e 's,%%ICONV_LIB%%,${ICONV_LIB},' \ ${WRKSRC}/Makefile - -post-install: -.for f in ${CONFIG_FILES} - @if [ ! -f ${ETCDIR}/${f} ]; then \ - ${CP} -p ${ETCDIR}/${f}.sample ${ETCDIR}/${f} ; \ - fi -.endfor +.if ${PORT_OPTIONS:MPLUGINS} + @${REINPLACE_CMD} -e 's,#ADD_PLUGINS,ADD_PLUGINS,' \ + ${WRKSRC}/Makefile +.endif .include Modified: head/net-im/imspector/files/patch-Makefile ============================================================================== --- head/net-im/imspector/files/patch-Makefile Wed Feb 19 14:45:19 2014 (r345097) +++ head/net-im/imspector/files/patch-Makefile Wed Feb 19 14:52:32 2014 (r345098) @@ -1,5 +1,5 @@ ---- Makefile.orig 2008-12-22 15:03:15.000000000 +0300 -+++ Makefile 2011-06-14 14:26:22.072210675 +0400 +--- Makefile.orig 2010-02-23 14:20:33.000000000 -0300 ++++ Makefile 2014-02-11 21:23:19.000000000 -0200 @@ -1,5 +1,5 @@ -DESTDIR = / -PREFIX = /usr @@ -46,7 +46,7 @@ yahooprotocolplugin.so: yahooprotocolplugin.o libimspector.so $(CXX) yahooprotocolplugin.o libimspector.so $(PLUGIN_FLAGS) ircprotocolplugin.so: ircprotocolplugin.o libimspector.so -@@ -162,15 +162,15 @@ +@@ -162,17 +162,17 @@ install: imspector libimspector.so $(PLUGINS) -mkdir -p $(DESTDIR)/$(PREFIX)/sbin -mkdir -p $(DESTDIR)/$(PREFIX)/lib/imspector @@ -62,10 +62,14 @@ - -install imspector.conf $(DESTDIR)/$(PREFIX)/etc/imspector/imspector.conf - -install badwords.txt $(DESTDIR)/$(PREFIX)/etc/imspector/badwords.txt - -install acl.txt $(DESTDIR)/$(PREFIX)/etc/imspector/acl.txt +- -mkdir -p /var/log/imspector +- -mkdir -p /var/lib/imspector + -mkdir -p $(DESTDIR)/$(ETCDIR) + -${BSD_INSTALL_DATA} imspector.conf $(DESTDIR)/$(ETCDIR)/imspector.conf.sample + -${BSD_INSTALL_DATA} badwords.txt $(DESTDIR)/$(ETCDIR)/badwords.txt.sample + -${BSD_INSTALL_DATA} acl.txt $(DESTDIR)/$(ETCDIR)/acl.txt.sample - -mkdir -p /var/log/imspector - -mkdir -p /var/lib/imspector ++ -mkdir -p $(DESTDIR)/var/log/imspector ++ -mkdir -p $(DESTDIR)/var/lib/imspector + install-cert: + -mkdir -p $(DESTDIR)/$(PREFIX)/etc/imspector Modified: head/net-im/imspector/pkg-plist ============================================================================== --- head/net-im/imspector/pkg-plist Wed Feb 19 14:45:19 2014 (r345097) +++ head/net-im/imspector/pkg-plist Wed Feb 19 14:52:32 2014 (r345098) @@ -23,6 +23,11 @@ lib/imspector/ircprotocolplugin.so lib/imspector/miscfilterplugin.so lib/imspector/msnprotocolplugin.so lib/imspector/yahooprotocolplugin.so +%%PLUGINS%%lib/imspector/dbfilterplugin.so +%%PLUGINS%%lib/imspector/dbresponderplugin.so +%%PLUGINS%%lib/imspector/mysqlloggingplugin.so +%%PLUGINS%%lib/imspector/postgresqlloggingplugin.so +%%PLUGINS%%lib/imspector/sqliteloggingplugin.so lib/libimspector.so sbin/imspector @dirrmtry %%ETCDIR%% @@ -31,4 +36,4 @@ sbin/imspector @dirrmtry lib/imspector @dirrmtry lib @dirrmtry log/imspector -@cwd +@cwd