From owner-svn-ports-all@FreeBSD.ORG Wed May 14 17:00:25 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0B23AA93; Wed, 14 May 2014 17:00:25 +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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DFA2B2343; Wed, 14 May 2014 17:00:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4EH0Oe1034554; Wed, 14 May 2014 17:00:24 GMT (envelope-from garga@svn.freebsd.org) Received: (from garga@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4EH0O7A034547; Wed, 14 May 2014 17:00:24 GMT (envelope-from garga@svn.freebsd.org) Message-Id: <201405141700.s4EH0O7A034547@svn.freebsd.org> From: Renato Botelho Date: Wed, 14 May 2014 17:00:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r354076 - in head/www/c-icap-modules: . 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-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 May 2014 17:00:25 -0000 Author: garga Date: Wed May 14 17:00:23 2014 New Revision: 354076 URL: http://svnweb.freebsd.org/changeset/ports/354076 QAT: https://qat.redports.org/buildarchive/r354076/ Log: . Use new LIB_DEPENDS syntax . INSTALL_TARGET = install-strip . USES libtool and drop .la files . Let the copy of default conf to .conf to pkg-plist only and make check-plist happy Approved by: portmgr (blanket) Added: head/www/c-icap-modules/files/ head/www/c-icap-modules/files/patch-services__url_check__Makefile.in (contents, props changed) head/www/c-icap-modules/files/patch-services__virus_scan__Makefile.in (contents, props changed) Modified: head/www/c-icap-modules/Makefile head/www/c-icap-modules/pkg-plist Modified: head/www/c-icap-modules/Makefile ============================================================================== --- head/www/c-icap-modules/Makefile Wed May 14 16:49:26 2014 (r354075) +++ head/www/c-icap-modules/Makefile Wed May 14 17:00:23 2014 (r354076) @@ -3,7 +3,7 @@ PORTNAME= c-icap PORTVERSION= 0.3.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www security MASTER_SITES= SF/${PORTNAME}/${PORTNAME}${PKGNAMESUFFIX}/0.3.x/ PKGNAMESUFFIX= -modules @@ -14,10 +14,12 @@ COMMENT= c-icap modules virus_scan and s LICENSE= GPLv2 -LIB_DEPENDS+= icapapi.3:${PORTSDIR}/www/c-icap \ - clamav:${PORTSDIR}/security/clamav +LIB_DEPENDS+= libicapapi.so:${PORTSDIR}/www/c-icap \ + libclamav.so:${PORTSDIR}/security/clamav +USES= libtool GNU_CONFIGURE= yes +INSTALL_TARGET= install-strip DATADIR= ${PREFIX}/share/c_icap CFLAGS+= -DHAVE_STRNSTR @@ -29,14 +31,4 @@ CONFIGURE_ARGS+= --enable-static \ pre-install: @${MKDIR} ${STAGEDIR}${PREFIX}/etc/c-icap -post-install: - @${CP} -np ${STAGEDIR}${PREFIX}/etc/c-icap/clamav_mod.conf.default \ - ${STAGEDIR}${PREFIX}/etc/c-icap/clamav_mod.conf || ${TRUE} - @${CP} -np ${STAGEDIR}${PREFIX}/etc/c-icap/clamd_mod.conf.default \ - ${STAGEDIR}${PREFIX}/etc/c-icap/clamd_mod.conf || ${TRUE} - @${CP} -np ${STAGEDIR}${PREFIX}/etc/c-icap/srv_url_check.conf.default \ - ${STAGEDIR}${PREFIX}/etc/c-icap/srv_url_check.conf || ${TRUE} - @${CP} -np ${STAGEDIR}${PREFIX}/etc/c-icap/virus_scan.conf.default \ - ${STAGEDIR}${PREFIX}/etc/c-icap/virus_scan.conf || ${TRUE} - .include Added: head/www/c-icap-modules/files/patch-services__url_check__Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/c-icap-modules/files/patch-services__url_check__Makefile.in Wed May 14 17:00:23 2014 (r354076) @@ -0,0 +1,10 @@ +--- services/url_check/Makefile.in.orig 2014-05-14 16:56:34.000000000 -0300 ++++ services/url_check/Makefile.in 2014-05-14 16:56:46.000000000 -0300 +@@ -731,7 +731,6 @@ + + install-data-local: + $(INSTALL) srv_url_check.conf $(DESTDIR)$(CONFIGDIR)/srv_url_check.conf.default +- if test ! -f $(DESTDIR)$(CONFIGDIR)/srv_url_check.conf; then $(INSTALL) srv_url_check.conf $(DESTDIR)$(CONFIGDIR)/srv_url_check.conf; fi + $(mkinstalldirs) $(DESTDIR)$(cicapdatadir)/templates/srv_url_check/en + $(INSTALL) $(TMPLS) $(DESTDIR)$(cicapdatadir)/templates/srv_url_check/en/ + Added: head/www/c-icap-modules/files/patch-services__virus_scan__Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/c-icap-modules/files/patch-services__virus_scan__Makefile.in Wed May 14 17:00:23 2014 (r354076) @@ -0,0 +1,10 @@ +--- services/virus_scan/Makefile.in.orig 2014-05-14 16:54:38.000000000 -0300 ++++ services/virus_scan/Makefile.in 2014-05-14 16:54:56.000000000 -0300 +@@ -647,7 +647,6 @@ + install-data-local: + for f in $(CONFS); do \ + $(INSTALL) $$f $(DESTDIR)$(CONFIGDIR)/$$f.default; \ +- if test ! -f $(DESTDIR)$(CONFIGDIR)/$$f; then $(INSTALL) $$f $(DESTDIR)$(CONFIGDIR)/$$f; fi \ + done + $(mkinstalldirs) $(DESTDIR)$(cicapdatadir)/templates/virus_scan/en/ + for f in $(TMPLS); do $(INSTALL) $$f $(DESTDIR)$(cicapdatadir)/templates/virus_scan/en/; done Modified: head/www/c-icap-modules/pkg-plist ============================================================================== --- head/www/c-icap-modules/pkg-plist Wed May 14 16:49:26 2014 (r354075) +++ head/www/c-icap-modules/pkg-plist Wed May 14 17:00:23 2014 (r354076) @@ -11,16 +11,12 @@ etc/c-icap/srv_url_check.conf.default etc/c-icap/virus_scan.conf.default @exec [ -f %B/virus_scan.conf ] || cp %B/%f %B/virus_scan.conf lib/c_icap/clamav_mod.a -lib/c_icap/clamav_mod.la lib/c_icap/clamav_mod.so lib/c_icap/clamd_mod.a -lib/c_icap/clamd_mod.la lib/c_icap/clamd_mod.so lib/c_icap/srv_url_check.a -lib/c_icap/srv_url_check.la lib/c_icap/srv_url_check.so lib/c_icap/virus_scan.a -lib/c_icap/virus_scan.la lib/c_icap/virus_scan.so man/man8/c-icap-mods-sguardDB.8.gz %%DATADIR%%/templates/srv_url_check/en/DENY