svn commit: r354072 - in head/www/squidclamav: . files

[Renato Botelho]

Author: garga
Date: Wed May 14 16:30:21 2014
New Revision: 354072
URL: http://svnweb.freebsd.org/changeset/ports/354072
QAT: https://qat.redports.org/buildarchive/r354072/

Log:
  . Support stage
  . Use new LIB_DEPENDS syntax
  . Fix shebang on necessary files
  . INSTALL_TARGET = install-strip
  . Add USES=libtool and drop .la files
  
  Approved by:	portmgr (blanket)

Modified:
  head/www/squidclamav/Makefile
  head/www/squidclamav/files/patch-etc-Makefile.in
  head/www/squidclamav/pkg-plist

Modified: head/www/squidclamav/Makefile
==============================================================================
--- head/www/squidclamav/Makefile	Wed May 14 15:31:46 2014	(r354071)
+++ head/www/squidclamav/Makefile	Wed May 14 16:30:21 2014	(r354072)
@@ -12,18 +12,18 @@ COMMENT=	Clamav c-icap service and redir
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS+=	icapapi:${PORTSDIR}/www/c-icap
+LIB_DEPENDS+=	libicapapi.so:${PORTSDIR}/www/c-icap
 
 GNU_CONFIGURE=	yes
 CFLAGS+=	-DHAVE_STRNSTR
-
-MAN1=		squidclamav.1
+USES=		shebangfix libtool
+SHEBANG_FILES=	cgi-bin/clwarn.cgi*
+INSTALL_TARGET=	install-strip
 
 CONFIGURE_ARGS+=	--enable-shared --enable-static \
 			--sysconfdir="${PREFIX}/etc/c-icap" \
 			--with-c-icap=${LOCALBASE}
 
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e 's|CFGDIR=.*|CFGDIR="${PREFIX}/etc/c-icap"|g' \
 		${WRKSRC}/configure.in ${WRKSRC}/configure

Modified: head/www/squidclamav/files/patch-etc-Makefile.in
==============================================================================
--- head/www/squidclamav/files/patch-etc-Makefile.in	Wed May 14 15:31:46 2014	(r354071)
+++ head/www/squidclamav/files/patch-etc-Makefile.in	Wed May 14 16:30:21 2014	(r354072)
@@ -1,10 +1,16 @@
---- etc/Makefile.in.orig	2012-08-15 03:15:12.431509933 +0200
-+++ etc/Makefile.in	2012-08-15 03:15:29.685506098 +0200
-@@ -338,6 +338,7 @@
+--- etc/Makefile.in.orig	2014-05-14 16:04:39.000000000 -0300
++++ etc/Makefile.in	2014-05-14 16:04:57.000000000 -0300
+@@ -338,12 +338,7 @@
  
  install-data-local:
  	$(mkinstalldirs) $(DESTDIR)$(CFGINST)
+-	@if test -f "$(DESTDIR)$(CFGINST)/squidclamav.conf" ; then \
+-		echo "$@ will not overwrite existing $(DESTDIR)$(CFGINST)/squidclamav.conf" ; \
+-	else \
+-		echo "$(INSTALL_DATA) $(srcdir)/squidclamav.conf $(DESTDIR)$(CFGINST)"; \
+-		$(INSTALL_DATA) $(srcdir)/squidclamav.conf $(DESTDIR)$(CFGINST)/squidclamav.conf; \
+-	fi
 +	$(INSTALL_DATA) $(srcdir)/squidclamav.conf $(DESTDIR)$(CFGINST)/squidclamav.conf.default
- 	@if test -f "$(DESTDIR)$(CFGINST)/squidclamav.conf" ; then \
- 		echo "$@ will not overwrite existing $(DESTDIR)$(CFGINST)/squidclamav.conf" ; \
- 	else \
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:

Modified: head/www/squidclamav/pkg-plist
==============================================================================
--- head/www/squidclamav/pkg-plist	Wed May 14 15:31:46 2014	(r354071)
+++ head/www/squidclamav/pkg-plist	Wed May 14 16:30:21 2014	(r354072)
@@ -3,7 +3,6 @@ etc/c-icap/squidclamav.conf.default
 @exec [ -f %B/squidclamav.conf ] || cp %B/%f %B/squidclamav.conf
 %%DATADIR%%/README
 lib/c_icap/squidclamav.a
-lib/c_icap/squidclamav.la
 lib/c_icap/squidclamav.so
 libexec/squidclamav/clwarn.cgi
 libexec/squidclamav/clwarn.cgi.de_DE
@@ -11,5 +10,6 @@ libexec/squidclamav/clwarn.cgi.en_EN
 libexec/squidclamav/clwarn.cgi.fr_FR
 libexec/squidclamav/clwarn.cgi.pt_BR
 libexec/squidclamav/clwarn.cgi.ru_RU
+man/man1/squidclamav.1.gz
 @dirrm libexec/squidclamav
 @dirrm %%DATADIR%%